Ferrite v3.1.3 - Merge pull request #57 from koh-gt/v3.1.3-r

koh-gt · web-flow · commit 7dcf7666d2ca · 2023-11-30T01:34:24.000+08:00
Ferrite v3.1.3
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,13 +1,13 @@
 <!-- This issue tracker is only for technical issues related to Ferrite Core.
 
-General ferrite questions and/or support requests and are best directed to the [ferritetalk.io forums](https://ferritetalk.io/).
+General Ferrite Core questions and/or support requests and are best directed to the [Ferrite Forums](https://ferritecoin.org:52443/).
 
-For reporting security issues, please contact the Ferrite developers on the #ferrite-dev Freenode IRC channel or alternatively you can email us at contact@ferrite.org.
+For reporting security issues, please contact the Ferrite developers on the [Telegram channel](https://t.me/ferrite_core) or alternatively you can email us at system@ferritecoin.org.
 
 If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue!
 
 Any report, issue or feature request related to the GUI should be reported at
-https://github.com/bitcoin-core/gui/issues/
+https://github.com/koh-gt/ferrite-core/issues/
 -->
 
 <!-- Describe the issue -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,18 +1,13 @@
 <!--
 *** Please remove the following help text before submitting: ***
-
+Thank you for contributing to Ferrite Core.
 Pull requests without a rationale and clear improvement may be closed
-immediately.
-
-GUI-related pull requests should be opened against
-https://github.com/bitcoin-core/gui
-first. See CONTRIBUTING.md
+immediately. Code comments are recommended and encouraged.
 -->
 
 <!--
-Please provide clear motivation for your patch and explain how it improves
-Bitcoin Core user experience or Bitcoin Core developer experience
-significantly:
+Please provide a brief explanation of how 
+Ferrite Core user or developer experience is improved:
 
 * Any test improvements or new tests that improve coverage are always welcome.
 * All other changes should have accompanying unit tests (see `src/test/`) or
@@ -23,21 +18,16 @@ significantly:
   explanation of the potential issue as well as reasoning for the way the bug
   was fixed.
 * Features are welcome, but might be rejected due to design or scope issues.
-  If a feature is based on a lot of dependencies, contributors should first
-  consider building the system outside of Bitcoin Core, if possible.
-* Refactoring changes are only accepted if they are required for a feature or
-  bug fix or otherwise improve developer experience significantly. For example,
-  most "code style" refactoring changes require a thorough explanation why they
-  are useful, what downsides they have and why they *significantly* improve
-  developer experience or avoid serious programming bugs. Note that code style
-  is often a subjective matter. Unless they are explicitly mentioned to be
-  preferred in the [developer notes](/doc/developer-notes.md), stylistic code
-  changes are usually rejected.
+  Contributors should first consider building the system outside of Ferrite Core, if possible.
+* Note that code style is often a subjective matter. 
+  Unless explicitly mentioned in the [developer notes](/doc/developer-notes.md), 
+  stylistic code changes are usually rejected.
 -->
 
 <!--
-Bitcoin Core has a thorough review process and even the most trivial change
-needs to pass a lot of eyes and requires non-zero or even substantial time
-effort to review. There is a huge lack of active reviewers on the project, so
-patches often sit for a long time.
+Ferrite Core has a thorough review process and changes
+need time and effort to review. 
+There is a huge lack of active reviewers on the project, 
+so patches may sit for a long time until the next release.
+Thank you for your patience.
 -->
diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 2)
+define(_CLIENT_VERSION_REVISION, 3)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt
@@ -26,6 +26,7 @@
 118.189.201.104:9574
 118.189.201.104:9588
 118.189.201.104:9598
+133.177.197.167:9574
 144.91.107.170:55622
 154.26.137.167:46284
 155.138.247.235:59488
diff --git a/doc/README.md b/doc/README.md
@@ -5,7 +5,7 @@ Setup
 ---------------------
 Ferrite Core is the original Ferrite client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Ferrite transactions, which requires approximately 22 gigabytes of disk space. Depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more.
 
-To download Ferrite Core, visit [ferrite.org](https://ferrite.org/).
+To download Ferrite Core, visit [ferritecoin.org](https://ferritecoin.org/).
 
 Running
 ---------------------
@@ -28,9 +28,9 @@ Drag Ferrite Core to your applications folder, and then run Ferrite Core.
 
 ### Need Help?
 
-* See the documentation at the [Ferrite Wiki](https://ferrite.info/) for help and more information.
-* Ask for help on [#ferrite](https://webchat.freenode.net/#ferrite) on Freenode. If you don't have an IRC client, use [webchat here](https://webchat.freenode.net/#ferrite).
-* Ask for help on the [FerriteTalk](https://ferritetalk.io/) forums, in the [Technical Support board](https://ferritetalk.io/c/technical-support).
+* See the documentation at the [Ferrite Github Wiki](https://github.com/koh-gt/ferrite-core/wiki) for help and more information.
+* Ask for help on [ferrite_core](https://t.me/ferrite_core) on Telegram. If you prefer to stay pseudonymous, use [Ferritext](https://github.com/koh-gt/ferritext/)
+* Ask for help on the [Ferrite Forum](https://ferritecoin.org:52443/) forums, in the Technical Support board.
 
 Building
 ---------------------
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" "Aug 2023" "ferrite-cli v3.1.2" "User Commands"
+.TH FERRITE-CLI "1" "Nov 2023" "ferrite-cli v3.1.3" "User Commands"
 .SH NAME
-ferrite-cli \- manual page for ferrite-cli v3.1.2
+ferrite-cli \- manual page for ferrite-cli v3.1.3
 .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" "Aug 2023" "ferrite-qt v3.1.2" "User Commands"
+.TH FERRITE-QT "1" "Nov 2023" "ferrite-qt v3.1.3" "User Commands"
 .SH NAME
-ferrite-qt \- manual page for ferrite-qt v3.1.2
+ferrite-qt \- manual page for ferrite-qt v3.1.3
 .SH SYNOPSIS
 .B ferrite-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Ferrite Core version v3.1.2 (64\-bit)
+Ferrite Core version v3.1.3 (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" "Aug 2023" "ferrite-tx v3.1.2" "User Commands"
+.TH FERRITE-TX "1" "Nov 2023" "ferrite-tx v3.1.3" "User Commands"
 .SH NAME
-ferrite-tx \- manual page for ferrite-tx v3.1.2
+ferrite-tx \- manual page for ferrite-tx v3.1.3
 .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 v3.1.2
+Ferrite Core ferrite\-tx utility version v3.1.3
 .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" "Aug 2023" "ferrite-wallet v3.1.2" "User Commands"
+.TH FERRITE-WALLET "1" "Nov 2023" "ferrite-wallet v3.1.3" "User Commands"
 .SH NAME
-ferrite-wallet \- manual page for ferrite-wallet v3.1.2
+ferrite-wallet \- manual page for ferrite-wallet v3.1.3
 .SH DESCRIPTION
-Ferrite Core ferrite\-wallet version v3.1.2
+Ferrite Core ferrite\-wallet version v3.1.3
 .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" "Aug 2023" "ferrited v3.1.2" "User Commands"
+.TH FERRITED "1" "Nov 2023" "ferrited v3.1.3" "User Commands"
 .SH NAME
-ferrited \- manual page for ferrited v3.1.2
+ferrited \- manual page for ferrited v3.1.3
 .SH SYNOPSIS
 .B ferrited
 [\fI\,options\/\fR]                     \fI\,Start Ferrite Core\/\fR
 .SH DESCRIPTION
-Ferrite Core version v3.1.2
+Ferrite Core version v3.1.3
 .SH OPTIONS
 .HP
 \-?
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -99,15 +99,17 @@ 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 = 150000; // 
+        consensus.vDeployments[Consensus::DEPLOYMENT_MWEB].nStartHeight = 150000; // 150120
         // 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.
 
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000050c151ee81a40c9");  
-        // A total of 363688 892397 404361 hashes (363.7 PH) of work as of block 149000.
-
+	consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000088358036fda6c15"); 
+        // A total of 613430 746037 251093 hashes (613.4 PH) of work as of block 154000. MWEB Activation height 150120
+	
+	// consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000088358036fda6c15"); 
+        // A total of 613430 746037 251093 hashes (613.4 PH) of work as of block 154000. MWEB Activation height 150120
 	// consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000050c151ee81a40c9");  
         // A total of 363688 892397 404361 hashes (363.7 PH) of work as of block 149000.
         // consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000009cec62dc44b76d");  
@@ -120,9 +122,11 @@ class CMainParams : public CChainParams {
         // A total of    187 976044 125601 hashes (188.0 TH) of work as of block 10000.
         
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0xef695bb26b2655308cba06c2dd9b303c833db933d0cd872104f3073e471da2b1");  
-        // Block 149000
+        consensus.defaultAssumeValid = uint256S("0xe4925099992f4ca3337c9f85deb52b88da80a6ea40127adf2bc6c2851d5d49b2");  
+        // Block 154000
 	    
+	// consensus.defaultAssumeValid = uint256S("0xe4925099992f4ca3337c9f85deb52b88da80a6ea40127adf2bc6c2851d5d49b2");  
+        // Block 154000    
         // consensus.defaultAssumeValid = uint256S("0xef695bb26b2655308cba06c2dd9b303c833db933d0cd872104f3073e471da2b1");  
         // Block 149000
         // consensus.defaultAssumeValid = uint256S("0x022dc4410add84d46359013d45df952493c53343304296a9066fc3df03dc8297");  
@@ -155,18 +159,19 @@ class CMainParams : public CChainParams {
 
         // Seed servers to connect to other nodes.
         // Default configuration file contains nodes of popular ferritecoin mining pools.
+	vSeeds.emplace_back("118.189.201.104");
+	vSeeds.emplace_back("38.242.145.73");
+        vSeeds.emplace_back("78.220.84.58");
+	vSeeds.emplace_back("133.177.197.167");
         vSeeds.emplace_back("node1.ferritecoin.org");  // node1.ferritecoin.org
         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     
-        vSeeds.emplace_back("144.91.107.170");   // coinxpool.com
-        vSeeds.emplace_back("155.138.247.235");  // miningmypool.com 
 
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,36);
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5);
@@ -200,13 +205,14 @@ class CMainParams : public CChainParams {
                 {    60000, uint256S("0xf38b639a8db731e7dac96eaae8f9ab443eaf85039433197345a72e1961d7f286")},
                 {   100000, uint256S("0x022dc4410add84d46359013d45df952493c53343304296a9066fc3df03dc8297")},
 		{   149000, uint256S("0xef695bb26b2655308cba06c2dd9b303c833db933d0cd872104f3073e471da2b1")},
+		{   154000, uint256S("0xe4925099992f4ca3337c9f85deb52b88da80a6ea40127adf2bc6c2851d5d49b2")},
             }
         };
 
         chainTxData = ChainTxData{
-            /* nTime    */ 1687991792,
-            /* nTxCount */ 162810,
-            /* dTxRate  */ 0.00492770
+            /* nTime    */ 1701118087,
+            /* nTxCount */ 173084,
+            /* dTxRate  */ 0.00237163
         };
     }
 };
diff --git a/src/init.cpp b/src/init.cpp
@@ -599,26 +599,35 @@ void SetupServerArgs(NodeContext& node)
 std::string LicenseInfo()
 {
     const std::string URL_SOURCE_CODE = "<https://github.com/koh-gt/ferrite-core>";
-    const std::string URL_WEBSITE = "<https://www.ferritecoin.org>";
-    const std::string URL_BLOCK_EXPLORER = "<https://explorer.ferritecoin.org>";
+    const std::string URL_WEBSITE = "<https://ferritecoin.org>";
+    const std::string URL_FORUM = "<https://ferritecoin.org:52443>";
+    const std::string URL_BLOCK_EXPLORER = "<https://ferritecoin.org:53443>";
+    const std::string FEXT_URL_WEBSITE = "<https://github.com/koh-gt/ferritext/>";
+    const std::string FEXT_HELP_URL_WEBSITE = "<https://github.com/koh-gt/ferritext/wiki>";
 
     return CopyrightHolders(strprintf(_("Copyright (C) %i-%i").translated, 2022, COPYRIGHT_YEAR) + " ") +
            strprintf(_("\nCopyright (C) %i-%i The Dash Core developers").translated, 2014, COPYRIGHT_YEAR) +
            strprintf(_("\nCopyright (C) %i-%i The Dogecoin Core developers").translated, 2013, COPYRIGHT_YEAR) +
            strprintf(_("\nCopyright (C) %i-%i The Litecoin Core developers").translated, 2011, COPYRIGHT_YEAR) +
            strprintf(_("\nCopyright (C) %i-%i The Bitcoin Core developers").translated, 2009, COPYRIGHT_YEAR) +
-           
+
            strprintf(_(" \n\nPlease contribute if you find %s useful. "
                        "Visit %s for further information about the software.").translated,
                PACKAGE_NAME, URL_WEBSITE) +
 
+           strprintf(_(" \n\nFerritext (FEXT) is a native messaging tool built on %s. FEXT is available from %s. "
+                       "Visit %s for further information about the feature.").translated,
+               PACKAGE_NAME, FEXT_URL_WEBSITE, FEXT_HELP_URL_WEBSITE) +
+        
+           strprintf(_("\nVisit Ferrite Forum at %s for more details.").translated,
+               URL_FORUM) +
+
            strprintf(_("\nThe source code is available from %s.").translated,
                URL_SOURCE_CODE) +
 
            strprintf(_("\nThe block explorer is available from %s.").translated,
                URL_BLOCK_EXPLORER) +
 
-           
            _("\n\nThis is experimental software.").translated +
            strprintf(_("\nDistributed under the MIT software license, see the accompanying file %s or %s").translated, "COPYING", "<https://opensource.org/licenses/MIT>") +
            strprintf(_("\n\nThis product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.").translated, "<https://opensource.org/licenses/MIT>");
@@ -1376,6 +1385,7 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA
                                     "addnode=node1.ferritecoin.org\n"
                                     "addnode=node2.ferritecoin.org\n"
                                     "addnode=node3.ferritecoin.org\n"  
+	                                "addnode=133.177.197.167:9574\n"
                                     "addnode=38.242.145.73:21004 # xeggex.com \n"
                                     "addnode=118.189.201.104:9574\n"
                                     "addnode=118.189.201.104:9588\n"
