Merge branch '928-move-to-new-bls-version' of https://github.com/skalenetwork/skale-consensus into 928-move-to-new-bls-version

PropzSaladaz · PropzSaladaz · commit 5f90fbacf109 · 2025-09-23T18:36:51.000+01:00
diff --git a/.github/workflows/buildm.yml b/.github/workflows/buildm.yml
@@ -1,4 +1,4 @@
-name: Build and test skale-consensus Mirage
+name: Build and test skale-consensus FAIR
 on: [push]
 jobs:
   build:
@@ -171,9 +171,9 @@ jobs:
         sudo apt-get install -y nettle-dev gnutls-dev
         cd deps && ./build.sh BUILD_LIBSEC256K1=1 && cd ..
 
-    - name: build consensus Mirage
+    - name: build consensus Fair
       run: |
-        cd scripts && ./build.py Debug -buildMIRAGE
+        cd scripts && ./build.py Debug -buildFAIR
     - name: run tests
       run: cd scripts && export CI_BUILD=1 && ./tests.py && cd ..
 
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,9 +5,9 @@ if (BITE)
     add_definitions(-DBITE)
 endif ()
 
-if (MIRAGE)
-    set(MIRAGE "1")
-    add_definitions(-DMIRAGE)
+if (FAIR)
+    set(FAIR "1")
+    add_definitions(-DFAIR)
     set(BITE "1")
     add_definitions(-DBITE)
 endif ()
@@ -155,7 +155,7 @@ AUX_SOURCE_DIRECTORY(monitoring monitoring_src)
 AUX_SOURCE_DIRECTORY(utils utils_src)
 AUX_SOURCE_DIRECTORY(statusserver statusserver_src)
 AUX_SOURCE_DIRECTORY(sgxclient sgxclient_src)
-if (NOT DEFINED MIRAGE)
+if (NOT DEFINED FAIR)
     AUX_SOURCE_DIRECTORY(oracle oracle_src)
 endif ()
 
@@ -232,10 +232,8 @@ SET(LINK_LIBRARIES
         "${DEPS_INSTALL_ROOT}/lib/libmicrohttpd.a"
         "${DEPS_INSTALL_ROOT}/lib/libjsonrpccpp-stub.a"
         "${DEPS_INSTALL_ROOT}/lib/libjsonrpccpp-common.a"
-        bls
         "${DEPS_INSTALL_ROOT}/lib/libzmq.a"
         "${DEPS_INSTALL_ROOT}/lib/libsodium.a"
-        ff
         "${DEPS_INSTALL_ROOT}/lib/libcryptopp.a"
         gmp
         gcov
@@ -283,7 +281,7 @@ add_library(consensus STATIC ${SRC_FILES})
 
 target_compile_options(consensus PRIVATE -Wno-error=unused-variable)
 
-target_link_libraries(consensus ${LINK_LIBRARIES})
+target_link_libraries(consensus PRIVATE ${LINK_LIBRARIES} PUBLIC bls)
 
 # consensus test agent
 
diff --git a/SkaleCommon.h b/SkaleCommon.h
@@ -369,7 +369,7 @@ static const uint64_t ZMQ_RECEIVE_RETRY_MS = 10;
 
 static const uint64_t DEFAULT_MIN_PRICE = 100000;
 
-#ifdef MIRAGE
+#ifdef FAIR
 static const uint64_t CONSTANT_PRICING_DEFAULT_PRICE = 100 * 1000;
 #endif
 
diff --git a/chains/Schain.cpp b/chains/Schain.cpp
@@ -98,7 +98,7 @@
 #include "network/Sockets.h"
 #include "network/ZMQSockets.h"
 #include "node/NodeInfo.h"
-#ifndef MIRAGE
+#ifndef FAIR
 #include "oracle/OracleClient.h"
 #include "oracle/OracleMessageThreadPool.h"
 #include "oracle/OracleResultAssemblyAgent.h"
@@ -327,7 +327,7 @@ void Schain::constructChildAgents() {
 
     try {
         optimizerAgent = make_shared<OptimizerAgent>(*this);
-#ifndef MIRAGE
+#ifndef FAIR
         oracleResultAssemblyAgent = make_shared< OracleResultAssemblyAgent >( *this );
 #endif
         pricingAgent = make_shared<PricingAgent>(*this);
@@ -352,7 +352,7 @@ void Schain::constructChildAgents() {
         blockProposalClient = make_shared<BlockProposalClientAgent>(*this);
 
         testMessageGeneratorAgent = make_shared<TestMessageGeneratorAgent>(*this);
-#ifndef MIRAGE
+#ifndef FAIR
         oracleClient = make_shared< OracleClient >( *this );
 #endif
     } catch (...) {
@@ -1655,7 +1655,7 @@ u256 Schain::getRandomForBlockId(block_id _blockId) {
 
 ptr<ofstream> Schain::visualizationDataStream = nullptr;
 
-#ifndef MIRAGE
+#ifndef FAIR
 const ptr< OracleResultAssemblyAgent >& Schain::getOracleResultAssemblyAgent() const {
     return oracleResultAssemblyAgent;
 }
diff --git a/chains/Schain.h b/chains/Schain.h
@@ -154,7 +154,7 @@ class Schain : public Agent {
 
     ptr< SchainMessageThreadPool > consensusMessageThreadPool;
 
-#ifndef MIRAGE
+#ifndef FAIR
     ptr< OracleResultAssemblyAgent > oracleResultAssemblyAgent;
 #endif
 
@@ -286,7 +286,7 @@ class Schain : public Agent {
 
     ptr< BlockConsensusAgent > blockConsensusInstance;
 
-#ifndef MIRAGE
+#ifndef FAIR
     ptr< OracleServerAgent > oracleServer;
     ptr< OracleClient > oracleClient;
 #endif
@@ -365,7 +365,7 @@ class Schain : public Agent {
 
     ptr< BlockConsensusAgent > getBlockConsensusInstance();
 
-#ifndef MIRAGE
+#ifndef FAIR
     ptr< OracleServerAgent > getOracleInstance();
 #endif
 
diff --git a/chains/SchainGettersSetters.cpp b/chains/SchainGettersSetters.cpp
@@ -157,7 +157,7 @@ ptr< BlockConsensusAgent > Schain::getBlockConsensusInstance() {
     return blockConsensusInstance;
 }
 
-#ifndef MIRAGE
+#ifndef FAIR
 ptr< OracleServerAgent > Schain::getOracleInstance() {
     CHECK_STATE( oracleServer != nullptr )
     return oracleServer;
@@ -290,7 +290,7 @@ void Schain::createBlockConsensusInstance() {
     blockConsensusInstance = make_shared< BlockConsensusAgent >( *this );
 }
 
-#ifndef MIRAGE
+#ifndef FAIR
 void Schain::createOracleInstance() {
     oracleServer = make_shared< OracleServerAgent >( *this );
 }
@@ -347,7 +347,7 @@ void Schain::setLastCommittedBlockId( uint64_t _lastCommittedBlockId ) {
     lastCommittedBlockID = _lastCommittedBlockId;
 }
 
-#ifndef MIRAGE
+#ifndef FAIR
 const ptr< OracleClient > Schain::getOracleClient() const {
     return oracleClient;
 }
diff --git a/crypto/CryptoManager.cpp b/crypto/CryptoManager.cpp
@@ -24,6 +24,7 @@
 
 
 #include <boost/asio.hpp>
+#include <random>
 
 #include "openssl/bio.h"
 
@@ -51,8 +52,6 @@
 
 #include "Log.h"
 #include "SkaleCommon.h"
-
-#include <gmp.h>
 #include <network/ClientSocket.h>
 
 #include "BLAKE3Hash.h"
@@ -353,15 +352,6 @@ Schain *CryptoManager::getSchain() const {
     return sChain;
 }
 
-
-MPZNumber::MPZNumber() {
-    mpz_init(this->number);
-}
-
-MPZNumber::~MPZNumber() {
-    mpz_clear(this->number);
-}
-
 using namespace std;
 unsigned long long int random_value = 0; // Declare value to store data into
 size_t size = sizeof(random_value); // Declare size of data
diff --git a/crypto/CryptoManager.h b/crypto/CryptoManager.h
@@ -72,18 +72,7 @@ namespace jsonrpc {
     class HttpClient;
 }
 
-class MPZNumber {
-public:
-    MPZNumber();
-
-    ~MPZNumber();
-
-    mpz_t number;
-};
-
-
 class OpenSSLECDSAKey;
-
 class OpenSSLEdDSAKey;
 
 #ifdef BITE
diff --git a/crypto/bls_include.h b/crypto/bls_include.h
@@ -51,9 +51,6 @@
 #pragma GCC diagnostic ignored "-Wparentheses"
 #pragma GCC diagnostic ignored "-Wreorder"
 
-#include <libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp>
-
-
 #include "bls.h"
 #pragma GCC diagnostic pop
 
diff --git a/db/PriceDB.cpp b/db/PriceDB.cpp
@@ -43,7 +43,7 @@ const string& PriceDB::getFormatVersion() {
 
 u256 PriceDB::readPrice( block_id _blockID ) {
     if ( _blockID <= 1 ) {
-#ifndef MIRAGE
+#ifndef FAIR
         return getSchain()->getNode()->getParamUint64(
             string( "DYNAMIC_PRICING_START_PRICE" ), DEFAULT_MIN_PRICE );
 #else
diff --git a/db/ProposalHashDB.cpp b/db/ProposalHashDB.cpp
@@ -37,7 +37,7 @@ ProposalHashDB::ProposalHashDB(
     Schain* _sChain, string& _dirName, string& _prefix, node_id _nodeId, uint64_t _maxDBSize )
     : CacheLevelDB( _sChain, _dirName, _prefix, _nodeId, _maxDBSize,
           LevelDBOptions::getProposalHashDBOptions(), false ) {
-#ifndef MIRAGE
+#ifndef FAIR
     constexpr const char* SCHAIN_INDEX = "schainIndex";
 
     auto index = this->readString( SCHAIN_INDEX );
diff --git a/exceptions/OracleException.cpp b/exceptions/OracleException.cpp
@@ -22,7 +22,7 @@
 */
 
 
-#ifndef MIRAGE
+#ifndef FAIR
 #include "SkaleCommon.h"
 #include "Log.h"
 #include "OracleException.h"
diff --git a/json/JSONFactory.cpp b/json/JSONFactory.cpp
@@ -249,7 +249,7 @@ void JSONFactory::createAndAddSChainFromJsonObject(
 
         _node->setEmptyBlockIntervalMs( emptyBlockIntervalMs );
 
-#ifdef MIRAGE
+#ifdef FAIR
         uint64_t constantGasPrice;
         try {
             constantGasPrice = element.at( "constantGasPrice" ).get< uint64_t >();
diff --git a/messages/Message.cpp b/messages/Message.cpp
@@ -34,7 +34,7 @@ ptr< ProtocolKey > Message::createProtocolKey() {
     CHECK_STATE( msgType == PARENT_COMPLETED || msgType == MSG_BVB_BROADCAST ||
                  msgType == MSG_AUX_BROADCAST || msgType == BIN_CONSENSUS_COMMIT ||
                  msgType == MSG_BLOCK_SIGN_BROADCAST
-#ifndef MIRAGE
+#ifndef FAIR
                  || msgType == MSG_ORACLE_REQ_BROADCAST
                  || msgType == MSG_ORACLE_RSP
 #endif
diff --git a/messages/Message.h b/messages/Message.h
@@ -41,7 +41,7 @@ enum MsgType {
     MSG_BLOCK_PROPOSAL = 13,
     MSG_BLOCK_COMMIT = 14,
     MSG_DA_PROOF = 15,
-#ifndef MIRAGE
+#ifndef FAIR
     MSG_ORACLE_REQ_BROADCAST = 16,
     MSG_ORACLE_RSP = 17
 #endif
diff --git a/messages/NetworkMessage.cpp b/messages/NetworkMessage.cpp
@@ -44,7 +44,7 @@
 #include "network/Buffer.h"
 #include "network/Network.h"
 #include "node/NodeInfo.h"
-#ifndef MIRAGE
+#ifndef FAIR
 #include "oracle/OracleRequestBroadcastMessage.h"
 #include "oracle/OracleResponseMessage.h"
 #endif
@@ -397,7 +397,7 @@ ptr< NetworkMessage > NetworkMessage::parseMessage(
                 schain_index( blockProposerIndex ), timeMs,
                 schain_id( sChainID ), msg_id( msgID ), sigShare, srcSchainIndex, ecdsaSig,
                 publicKey, pkSig, _sChain );
-#ifndef MIRAGE
+#ifndef FAIR
         } else if ( type == BasicHeader::ORACLE_REQUEST_BROADCAST ) {
             string spec = getStringRapid( d, "spec" );
             CHECK_STATE( !spec.empty() )
diff --git a/network/Network.cpp b/network/Network.cpp
@@ -33,7 +33,7 @@
 #include "db/BlockProposalDB.h"
 #include "exceptions/FatalError.h"
 #include "messages/NetworkMessage.h"
-#ifndef MIRAGE
+#ifndef FAIR
 #include "oracle/OracleRequestBroadcastMessage.h"
 #include "oracle/OracleResponseMessage.h"
 #endif
@@ -42,7 +42,7 @@
 #include "protocols/blockconsensus/BlockSignBroadcastMessage.h"
 #include "thirdparty/json.hpp"
 #include "thirdparty/lrucache.hpp"
-#ifndef MIRAGE
+#ifndef FAIR
 #include "oracle/OracleResultAssemblyAgent.h"
 #endif
 #include <db/MsgDB.h>
@@ -196,7 +196,7 @@ void Network::broadcastMessageImpl( const ptr< NetworkMessage >& _msg, bool _isF
     }
 }
 
-#ifndef MIRAGE
+#ifndef FAIR
 void Network::broadcastOracleRequestMessage( const ptr< OracleRequestBroadcastMessage >& _msg ) {
     // Oracle messages are simply broadcast without resends
     CHECK_ARGUMENT( _msg );
diff --git a/network/Network.h b/network/Network.h
@@ -77,7 +77,7 @@ class Network : public Agent {
 
     static string ipToString( uint32_t _ip );
 
-#ifndef MIRAGE
+#ifndef FAIR
     void broadcastOracleRequestMessage( const ptr< OracleRequestBroadcastMessage >& _msg );
 
     void sendOracleResponseMessage( const ptr< OracleResponseMessage >& _msg, schain_index _index );
diff --git a/node/ConsensusEngine.cpp b/node/ConsensusEngine.cpp
@@ -84,7 +84,6 @@
 #include "boost/stacktrace.hpp"
 #include <libBLS/bls/BLSPublicKeyShare.h>
 #include <boost/multiprecision/cpp_int.hpp>
-#include <libff/common/profiling.hpp>
 
 
 #include "spdlog/sinks/rotating_file_sink.h"
@@ -647,9 +646,7 @@ void ConsensusEngine::systemHealthCheck() {
 void ConsensusEngine::init() {
     cout << "Consensus engine init(): version:" + ConsensusEngine::getEngineVersion() << endl;
 
-    libff::inhibit_profiling_counters = true;
-
-    libBLS::ThresholdUtils::initCurve();
+    libBLS::init();
 
     threadRegistry = make_shared< GlobalThreadRegistry >();
 
@@ -771,7 +768,7 @@ void ConsensusEngine::exitGracefully() {
     thread( [this]() { exitGracefullyAsync(); } ).detach();
 }
 
-#ifdef MIRAGE
+#ifdef FAIR
 void ConsensusEngine::updateLogger() const {
     logThreadLocal_ = nodes.begin()->second->getLog();
 }
diff --git a/node/ConsensusEngine.h b/node/ConsensusEngine.h
@@ -245,7 +245,7 @@ class ConsensusEngine : public ConsensusInterface {
 
     virtual void exitGracefully() override;
 
-#ifdef MIRAGE
+#ifdef FAIR
     virtual void updateLogger() const override;
 #endif
 
diff --git a/node/ConsensusInterface.h b/node/ConsensusInterface.h
@@ -220,7 +220,7 @@ class ConsensusInterface {
     // if isSyncing is false, all fields will be set to zero.
     virtual SyncInfo getSyncInfo() = 0;
 
-#ifdef MIRAGE
+#ifdef FAIR
     virtual void updateLogger() const = 0;
 #endif
 
diff --git a/node/Node.cpp b/node/Node.cpp
@@ -510,7 +510,7 @@ void Node::initSchain( const ptr< Node >& _node, schain_index _schainIndex, scha
         }
 
         chain->createBlockConsensusInstance();
-#ifndef MIRAGE
+#ifndef FAIR
         chain->createOracleInstance();
 #endif
 
diff --git a/node/Node.h b/node/Node.h
diff --git a/node/NodeGettersSetters.cpp b/node/NodeGettersSetters.cpp
diff --git a/pendingqueue/TestMessageGeneratorAgent.cpp b/pendingqueue/TestMessageGeneratorAgent.cpp
diff --git a/pendingqueue/TestMessageGeneratorAgent.h b/pendingqueue/TestMessageGeneratorAgent.h
diff --git a/pricing/PricingAgent.cpp b/pricing/PricingAgent.cpp
diff --git a/scripts/build.py b/scripts/build.py

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ ptr< BlockConsensusAgent > Schain::getBlockConsensusInstance() {`
`157`	`157`	`return blockConsensusInstance;`
`158`	`158`	`}`
`159`	`159`
`160`		`-#ifndef MIRAGE`
	`160`	`+#ifndef FAIR`
`161`	`161`	`ptr< OracleServerAgent > Schain::getOracleInstance() {`
`162`	`162`	`CHECK_STATE( oracleServer != nullptr )`
`163`	`163`	`return oracleServer;`
`@@ -290,7 +290,7 @@ void Schain::createBlockConsensusInstance() {`
`290`	`290`	`blockConsensusInstance = make_shared< BlockConsensusAgent >( *this );`
`291`	`291`	`}`
`292`	`292`
`293`		`-#ifndef MIRAGE`
	`293`	`+#ifndef FAIR`
`294`	`294`	`void Schain::createOracleInstance() {`
`295`	`295`	`oracleServer = make_shared< OracleServerAgent >( *this );`
`296`	`296`	`}`
`@@ -347,7 +347,7 @@ void Schain::setLastCommittedBlockId( uint64_t _lastCommittedBlockId ) {`
`347`	`347`	`lastCommittedBlockID = _lastCommittedBlockId;`
`348`	`348`	`}`
`349`	`349`
`350`		`-#ifndef MIRAGE`
	`350`	`+#ifndef FAIR`
`351`	`351`	`const ptr< OracleClient > Schain::getOracleClient() const {`
`352`	`352`	`return oracleClient;`
`353`	`353`	`}`