skalenetwork · olehnikolaiev · Nov 23, 2023 · Oct 20, 2023 · Oct 24, 2023 · Oct 24, 2023
diff --git a/libethcore/ChainOperationParams.h b/libethcore/ChainOperationParams.h
@@ -140,6 +140,7 @@ struct GroupNode {
     u256 id;
     u256 schainIndex;
     std::string publicKey;
+    std::string owner;
 };
 
 /// skale

diff --git a/libethereum/ChainParams.cpp b/libethereum/ChainParams.cpp
@@ -291,7 +291,8 @@ ChainParams ChainParams::loadConfig(
                     u256 sChainIndex = groupNodeConfObj[0].get_uint64();
                     u256 id = groupNodeConfObj[1].get_uint64();
                     std::string publicKey = groupNodeConfObj[2].get_str();
-                    groupNodes.push_back( { id, sChainIndex, publicKey } );
+                    std::string owner = groupNodeConfObj[3].get_str();
+                    groupNodes.push_back( { id, sChainIndex, publicKey, owner } );
                 }
                 std::sort( groupNodes.begin(), groupNodes.end(),
                     []( const GroupNode& lhs, const GroupNode& rhs ) {

diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp
@@ -314,7 +314,7 @@
         Defaults::setDBPath( m_dbPath );
 
     if ( ChainParams().sChain.nodeGroups.size() > 0 )
-        initIMABLSPublicKey();
+        initHistoricGroupIndex();
 
     // init snapshots for not newly created chains
     if ( number() ) {
@@ -621,7 +621,7 @@
     }
 
     if ( chainParams().sChain.nodeGroups.size() > 0 )
-        updateIMABLSPublicKey();
+        updateHistoricGroupIndex();
 
     m_snapshotAgent->doSnapshotIfNeeded( number(), _timestamp );
 
@@ -1288,9 +1288,9 @@
     return ret;
 }
 
-void Client::initIMABLSPublicKey() {
+void Client::initHistoricGroupIndex() {
     if ( number() == 0 ) {
-        imaBLSPublicKeyGroupIndex = 0;
+        historicGroupIndex = 0;
         return;
     }
 
@@ -1311,15 +1311,15 @@
             it = prevIt;
     }
 
-    imaBLSPublicKeyGroupIndex = std::distance( chainParams().sChain.nodeGroups.begin(), it );
+    historicGroupIndex = std::distance( chainParams().sChain.nodeGroups.begin(), it );
 }
 
-void Client::updateIMABLSPublicKey() {
+void Client::updateHistoricGroupIndex() {
     uint64_t blockTimestamp = blockInfo( hashFromNumber( number() ) ).timestamp();
-    uint64_t currentFinishTs = chainParams().sChain.nodeGroups[imaBLSPublicKeyGroupIndex].finishTs;
+    uint64_t currentFinishTs = chainParams().sChain.nodeGroups[historicGroupIndex].finishTs;
     if ( blockTimestamp >= currentFinishTs )
-        ++imaBLSPublicKeyGroupIndex;
-    assert( imaBLSPublicKeyGroupIndex < chainParams().sChain.nodeGroups.size() );
+        ++historicGroupIndex;
+    assert( historicGroupIndex < chainParams().sChain.nodeGroups.size() );
 }
 
 // new block watch

diff --git a/libethereum/Client.h b/libethereum/Client.h
@@ -297,7 +297,22 @@ class Client : public ClientBase, protected Worker {
     }
 
     std::array< std::string, 4 > getIMABLSPublicKey() const {
-        return chainParams().sChain.nodeGroups[imaBLSPublicKeyGroupIndex].blsPublicKey;
+        return chainParams().sChain.nodeGroups[historicGroupIndex].blsPublicKey;
+    }
+
+    // get node id for historic node in chain
+    std::string getHistoricNodeId( unsigned _id ) const {
+        return chainParams().sChain.nodeGroups[historicGroupIndex].nodes[_id].id.str();
+    }
+
+    // get schain index for historic node in chain
+    std::string getHistoricNodeIndex( unsigned _idx ) const {
+        return chainParams().sChain.nodeGroups[historicGroupIndex].nodes[_idx].schainIndex.str();
+    }
+
+    // get node owner for historic node in chain
+    std::string getHistoricNodeOwner( unsigned _idx ) const {
+        return chainParams().sChain.nodeGroups[historicGroupIndex].nodes[_idx].owner;
     }
 
     void doStateDbCompaction() const { m_state.getOriginalDb()->doCompaction(); }
@@ -532,10 +547,11 @@ class Client : public ClientBase, protected Worker {
     fs::path m_dbPath;
 
 private:
-    void initIMABLSPublicKey();
-    void updateIMABLSPublicKey();
+    void initHistoricGroupIndex();
+    void updateHistoricGroupIndex();
 
-    unsigned imaBLSPublicKeyGroupIndex = 0;
+    // which group corresponds to the current block timestamp on this node
+    unsigned historicGroupIndex = 0;
 
 public:
     FILE* performance_fd;

diff --git a/libethereum/Precompiled.cpp b/libethereum/Precompiled.cpp
@@ -756,6 +756,26 @@
     return uValue;
 }
 
+static bool isCallToHistoricData( const std::string& callData ) {
+    return skutils::tools::wildcmp( "skaleConfig.sChain.nodes.*", callData.c_str() );
+}
+
+static std::pair< std::string, unsigned > parseHistoricFieldReuqest( const std::string& callData ) {
+    size_t numberLength = callData.find( ']' ) - callData.find( '[' ) - 1;
+    unsigned id = std::stoul( callData.substr( callData.find( '[' ) + 1, numberLength ) );
+    std::string fieldName;
+    if ( callData.find( "id" ) != std::string::npos ) {
+        fieldName = "id";
+    } else if ( callData.find( "schainIndex" ) != std::string::npos ) {
+        fieldName = "schainIndex";
+    } else if ( callData.find( "owner" ) != std::string::npos ) {
+        fieldName = "owner";
+    } else {
+        fieldName = "unknown field";
+    }
+    return { fieldName, id };
+}
+
 ETH_REGISTER_PRECOMPILED( getConfigVariableUint256 )( bytesConstRef _in ) {
     try {
         size_t lengthName;
@@ -767,18 +787,37 @@
 
         if ( !g_configAccesssor )
             throw std::runtime_error( "Config accessor was not initialized" );
-        nlohmann::json joConfig = g_configAccesssor->getConfigJSON();
-        nlohmann::json joValue =
-            skutils::json_config_file_accessor::stat_extract_at_path( joConfig, rawName );
-        std::string strValue = skutils::tools::trim_copy(
-            joValue.is_string() ? joValue.get< std::string >() : joValue.dump() );
+
+        std::string strValue;
+        // call to skaleConfig.sChain.nodes means call to the historic data
+        // need to proccess it in a different way
+        if ( isCallToHistoricData( rawName ) ) {
+            if ( !g_skaleHost )
+                throw std::runtime_error( "SkaleHost accessor was not initialized" );
+
+            std::string field;
+            unsigned id;
+            std::tie( field, id ) = parseHistoricFieldReuqest( rawName );
+            if ( field == "id" ) {
+                strValue = g_skaleHost->getHistoricNodeId( id );
+            } else if ( field == "schainIndex" ) {
+                strValue = g_skaleHost->getHistoricNodeIndex( id );
+            } else {
+                throw std::runtime_error( "Incorrect config field" );
+            }
+        } else {
+            nlohmann::json joConfig = g_configAccesssor->getConfigJSON();
+            nlohmann::json joValue =
+                skutils::json_config_file_accessor::stat_extract_at_path( joConfig, rawName );
+            strValue = skutils::tools::trim_copy(
+                joValue.is_string() ? joValue.get< std::string >() : joValue.dump() );
+        }
 
         // dev::u256 uValue( strValue.c_str() );
         dev::u256 uValue = stat_parse_u256_hex_or_dec( strValue );
         // std::cout << "------------ Loaded config var \""
         //          << rawName << "\" value is " << uValue
         //          << "\n";
-
         bytes response = toBigEndian( uValue );
         return { true, response };
     } catch ( std::exception& ex ) {
@@ -807,11 +846,30 @@
 
         if ( !g_configAccesssor )
             throw std::runtime_error( "Config accessor was not initialized" );
-        nlohmann::json joConfig = g_configAccesssor->getConfigJSON();
-        nlohmann::json joValue =
-            skutils::json_config_file_accessor::stat_extract_at_path( joConfig, rawName );
-        std::string strValue = skutils::tools::trim_copy(
-            joValue.is_string() ? joValue.get< std::string >() : joValue.dump() );
+
+        std::string strValue;
+        // call to skaleConfig.sChain.nodes means call to the historic data
+        // need to proccess it in a different way
+        if ( isCallToHistoricData( rawName ) ) {
+            if ( !g_skaleHost )
+                throw std::runtime_error( "SkaleHost accessor was not initialized" );
+
+            std::string field;
+            unsigned id;
+            std::tie( field, id ) = parseHistoricFieldReuqest( rawName );
+            if ( field == "owner" ) {
+                strValue = g_skaleHost->getHistoricNodeOwner( id );
+            } else {
+                throw std::runtime_error( "Incorrect config field" );
+            }
+        } else {
+            nlohmann::json joConfig = g_configAccesssor->getConfigJSON();
+            nlohmann::json joValue =
+                skutils::json_config_file_accessor::stat_extract_at_path( joConfig, rawName );
+            strValue = skutils::tools::trim_copy(
+                joValue.is_string() ? joValue.get< std::string >() : joValue.dump() );
+        }
+
         dev::u256 uValue( strValue.c_str() );
 
         bytes response = toBigEndian( uValue );

diff --git a/libethereum/SkaleHost.cpp b/libethereum/SkaleHost.cpp
@@ -950,6 +950,18 @@
     return m_client.getIMABLSPublicKey();
 }
 
+std::string SkaleHost::getHistoricNodeId( unsigned _id ) const {
+    return m_client.getHistoricNodeId( _id );
+}
+
+std::string SkaleHost::getHistoricNodeIndex( unsigned _index ) const {
+    return m_client.getHistoricNodeIndex( _index );
+}
+
+std::string SkaleHost::getHistoricNodeOwner( unsigned _idx ) const {
+    return m_client.getHistoricNodeOwner( _idx );
+}
+
 uint64_t SkaleHost::submitOracleRequest(
     const string& _spec, string& _receipt, string& _errorMessage ) {
     return m_consensus->submitOracleRequest( _spec, _receipt, _errorMessage );

diff --git a/libethereum/SkaleHost.h b/libethereum/SkaleHost.h
@@ -126,6 +126,15 @@ class SkaleHost {
     std::map< std::string, uint64_t > getConsensusDbUsage() const;
     std::array< std::string, 4 > getIMABLSPublicKey() const;
 
+    // get node id for historic node in chain
+    std::string getHistoricNodeId( unsigned _id ) const;
+
+    // get schain index for historic node in chain
+    std::string getHistoricNodeIndex( unsigned _idx ) const;
+
+    // get node owner for historic node in chain
+    std::string getHistoricNodeOwner( unsigned _idx ) const;
+
     uint64_t submitOracleRequest( const string& _spec, string& _receipt, string& _errorMessage );
     uint64_t checkOracleResult( const string& _receipt, string& _result );
 

diff --git a/test/unittests/libethereum/ClientTest.cpp b/test/unittests/libethereum/ClientTest.cpp
@@ -871,7 +871,8 @@ static std::string const c_genesisInfoSkaleIMABLSPublicKeyTest = std::string() +
                     "30": [
                         0,
                         30,
-                        "0x6180cde2cbbcc6b6a17efec4503a7d4316f8612f411ee171587089f770335f484003ad236c534b9afa82befc1f69533723abdb6ec2601e582b72dcfd7919338b"
+                        "0x6180cde2cbbcc6b6a17efec4503a7d4316f8612f411ee171587089f770335f484003ad236c534b9afa82befc1f69533723abdb6ec2601e582b72dcfd7919338b",
+                        "0x23bbe8db4e347b4e8c937c1c8350e4b5ed33adb3db69cbdb7a38e1f40a1b82fe"
                     ]
                 },
                 "finish_ts": null,
@@ -887,7 +888,8 @@ static std::string const c_genesisInfoSkaleIMABLSPublicKeyTest = std::string() +
                     "26": [
                         3,
                         26,
-                        "0x3a581d62b12232dade30c3710215a271984841657449d1f474295a13737b778266f57e298f123ae80cbab7cc35ead1b62a387556f94b326d5c65d4a7aa2abcba"
+                        "0x3a581d62b12232dade30c3710215a271984841657449d1f474295a13737b778266f57e298f123ae80cbab7cc35ead1b62a387556f94b326d5c65d4a7aa2abcba",
+                        "0x47bbe8db4e347b4e8c937c1c8350e4b7ed30adb3db69bbdb7a38c1f40a1b82fd"
                     ]
                 },
                 "finish_ts": 4294967290,
@@ -923,9 +925,10 @@ BOOST_AUTO_TEST_CASE( initAndUpdateIMABLSPUblicKey ) {
 
     std::array< std::string, 4 > imaBLSPublicKeyOnStartUp = { "12457351342169393659284905310882617316356538373005664536506840512800919345414", "11573096151310346982175966190385407867176668720531590318594794283907348596326", "13929944172721019694880576097738949215943314024940461401664534665129747139387", "7375214420811287025501422512322868338311819657776589198925786170409964211914" };
 
-
     BOOST_REQUIRE( testClient->getIMABLSPublicKey() == imaBLSPublicKeyOnStartUp );
-
+    BOOST_REQUIRE( testClient->getHistoricNodeOwner( 0 ) == "0x47bbe8db4e347b4e8c937c1c8350e4b7ed30adb3db69bbdb7a38c1f40a1b82fd" );
+    BOOST_REQUIRE( testClient->getHistoricNodeId( 0 ) == "26" );
+    BOOST_REQUIRE( testClient->getHistoricNodeIndex( 0 ) == "3" );
 
     BOOST_REQUIRE( testClient->mineBlocks( 1 ) );
 
@@ -934,6 +937,9 @@ BOOST_AUTO_TEST_CASE( initAndUpdateIMABLSPUblicKey ) {
     std::array< std::string, 4 > imaBLSPublicKeyAfterBlock = { "10860211539819517237363395256510340030868592687836950245163587507107792195621", "2419969454136313127863904023626922181546178935031521540751337209075607503568", "3399776985251727272800732947224655319335094876742988846345707000254666193993", "16982202412630419037827505223148517434545454619191931299977913428346639096984" };
 
     BOOST_REQUIRE( testClient->getIMABLSPublicKey() == imaBLSPublicKeyAfterBlock );
+    BOOST_REQUIRE( testClient->getHistoricNodeOwner( 0 ) == "0x23bbe8db4e347b4e8c937c1c8350e4b5ed33adb3db69cbdb7a38e1f40a1b82fe" );
+    BOOST_REQUIRE( testClient->getHistoricNodeId( 0 ) == "30" );
+    BOOST_REQUIRE( testClient->getHistoricNodeIndex( 0 ) == "0" );
 }
 
 BOOST_AUTO_TEST_SUITE_END()