Merge branch 'dev_sec_storage' into develop

GeniusVentures · Jul 17, 2024 · 5088518 · 5088518
2 parents f1cfca0 + 8eeb659
commit 5088518
Show file tree

Hide file tree

Showing 107 changed files with 834 additions and 292 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,7 +29,6 @@ rel/
 
 # IDEs
 .idea
-.vscode
 
 # Visual Studio
 *.vcxproj

diff --git a/.gitmodules b/.gitmodules
@@ -5,3 +5,6 @@
 [submodule "zkPOC"]
 	path = zkPOC
 	url = ../zkPOC.git
+[submodule "GeniusKDF"]
+	path = GeniusKDF
+	url = ../GeniusKDF
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Node Example (Linux)",
+            "program": "${workspaceFolder}/build/Linux/Debug/example/node_test/node_example",
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}
diff --git a/GeniusKDF b/GeniusKDF
diff --git a/app/integration/AuthorApiFactory.hpp b/app/integration/AuthorApiFactory.hpp
@@ -8,7 +8,7 @@
 #define _AUTHOR_API_FACTORY_HPP_
 
 #include "api/service/author/impl/author_api_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "transaction_pool/transaction_pool.hpp"
 #include "crypto/hasher.hpp"
 #include "network/extrinsic_gossiper.hpp"

diff --git a/app/integration/AuthorityUpdateObserverFactory.hpp b/app/integration/AuthorityUpdateObserverFactory.hpp
@@ -8,7 +8,7 @@
 #define _AUTHORITY_UPDATE_OBSERVER_FACTORY_HPP_
 
 #include "verification/authority/impl/authority_manager_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "application/app_state_manager.hpp"
 #include "blockchain/block_tree.hpp"
 #include "storage/buffer_map_types.hpp"

diff --git a/app/integration/BlockBuilderManager.hpp b/app/integration/BlockBuilderManager.hpp
@@ -9,7 +9,7 @@
 
 #include "authorship/impl/block_builder_factory_impl.hpp"
 #include "authorship/impl/block_builder_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "blockchain/block_header_repository.hpp"
 
 namespace sgns

diff --git a/app/integration/BlockExecutorFactory.hpp b/app/integration/BlockExecutorFactory.hpp
@@ -8,7 +8,7 @@
 #define _BLOCK_EXECUTOR_FACTORY_HPP_
 
 #include "verification/production/impl/block_executor.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "blockchain/block_tree.hpp"
 #include "primitives/production_configuration.hpp"
 #include "verification/production/production_synchronizer.hpp"

diff --git a/app/integration/BlockHeaderRepositoryFactory.hpp b/app/integration/BlockHeaderRepositoryFactory.hpp
@@ -9,7 +9,7 @@
 #define _BLOCK_HEADER_REPOSITORY_FACTORY_HPP_
 
 #include "blockchain/impl/key_value_block_header_repository.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 
 class BlockHeaderRepositoryFactory
 {

diff --git a/app/integration/BlockStorageFactory.hpp b/app/integration/BlockStorageFactory.hpp
@@ -8,7 +8,7 @@
 #define _BLOCK_STORAGE_FACTORY_HPP_
 
 #include "blockchain/block_storage.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "storage/trie/trie_storage.hpp"
 #include "blockchain/impl/key_value_block_storage.hpp"
 #include "application/key_storage.hpp"
@@ -63,7 +63,7 @@ namespace sgns
                 {
                     // handle genesis initialization, which happens when there is not
                     // authorities and last completed round in the storage
-                    if ( !buff_storage->get( storage::kAuthoritySetKey ) )
+                    if ( !buff_storage->get( storage::GetAuthoritySetKey() ) )
                     {
                         // insert authorities
                         // TODO - Insert authorities here from finalityAPI
@@ -86,7 +86,7 @@ namespace sgns
                                            weighted_authority.weight );
                         }
                         BOOST_ASSERT_MSG( voters.size() != 0, "Finality voters are empty" );
-                        auto authorities_put_res = buff_storage->put( storage::kAuthoritySetKey, base::Buffer( scale::encode( voters ).value() ) );
+                        auto authorities_put_res = buff_storage->put( storage::GetAuthoritySetKey(), base::Buffer( scale::encode( voters ).value() ) );
                         if ( !authorities_put_res )
                         {
                             BOOST_ASSERT_MSG( false, "Could not insert authorities" );

diff --git a/app/integration/BlockTreeFactory.hpp b/app/integration/BlockTreeFactory.hpp
@@ -8,7 +8,7 @@
 #define _BLOCK_TREE_FACTORY_HPP_
 
 #include "blockchain/impl/block_tree_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "blockchain/block_header_repository.hpp"
 #include "blockchain/block_storage.hpp"
 #include "network/extrinsic_observer.hpp"

diff --git a/app/integration/BlockValidatorFactory.hpp b/app/integration/BlockValidatorFactory.hpp
@@ -8,7 +8,7 @@
 #define _BLOCK_VALIDATOR_FACTORY_HPP_
 
 #include "verification/validation/production_block_validator.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "blockchain/block_tree.hpp"
 #include "crypto/hasher.hpp"
 #include "crypto/sr25519_provider.hpp"

diff --git a/app/integration/CComponentFactory.hpp b/app/integration/CComponentFactory.hpp
diff --git a/app/integration/EnvironmentFactory.hpp b/app/integration/EnvironmentFactory.hpp
@@ -7,7 +7,7 @@
 #ifndef _ENVIRONMENT_FACTORY_HPP_
 #define _ENVIRONMENT_FACTORY_HPP_
 #include "verification/finality/impl/environment_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "blockchain/block_tree.hpp"
 #include "blockchain/block_header_repository.hpp"
 #include "verification/finality/gossiper.hpp"

diff --git a/app/integration/EpochStorageFactory.hpp b/app/integration/EpochStorageFactory.hpp
@@ -7,7 +7,7 @@
 #ifndef _EPOCH_STORAGE_HPP_
 #define _EPOCH_STORAGE_HPP_
 #include "verification/production/impl/epoch_storage_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "storage/buffer_map_types.hpp"
 
 class EpochStorageFactory

diff --git a/app/integration/ExtrinsicObserverFactory.hpp b/app/integration/ExtrinsicObserverFactory.hpp
@@ -7,7 +7,7 @@
 #ifndef _EXTRINSIC_OBSERVER_FACTORY_HPP_
 #define _EXTRINSIC_OBSERVER_FACTORY_HPP_
 #include "network/impl/extrinsic_observer_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "api/service/author/author_api.hpp"
 
 class ExtrinsicObserverFactory

diff --git a/app/integration/FinalityFactory.hpp b/app/integration/FinalityFactory.hpp
@@ -8,7 +8,7 @@
 #define _FINALITY_FACTORY_HPP_
 
 #include "verification/finality/impl/finality_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "application/app_state_manager.hpp"
 #include "verification/finality/environment.hpp"
 #include "storage/buffer_map_types.hpp"

diff --git a/app/integration/IComponentFactory.hpp b/app/integration/IComponentFactory.hpp
diff --git a/app/integration/OwnPeerInfoFactory.hpp b/app/integration/OwnPeerInfoFactory.hpp
@@ -8,7 +8,7 @@
 #define _OWN_PEER_INFO_FACTORY_HPP_
 
 #include "network/types/own_peer_info.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "application/key_storage.hpp"
 #include <libp2p/injector/host_injector.hpp>
 #include "base/outcome_throw.hpp"

diff --git a/app/integration/PoolModeratorFactory.hpp b/app/integration/PoolModeratorFactory.hpp
@@ -8,7 +8,7 @@
 #define _POOL_MODERATOR_FACTORY_HPP_
 
 #include "transaction_pool/impl/pool_moderator_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "clock/clock.hpp"
 
 class PoolModeratorFactory

diff --git a/app/integration/ProductionFactory.hpp b/app/integration/ProductionFactory.hpp
@@ -8,7 +8,7 @@
 #ifndef _PRODUCTION_FACTORY_HPP_
 #define _PRODUCTION_FACTORY_HPP_
 
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "verification/production/impl/production_impl.hpp"
 #include "application/app_state_manager.hpp"
 #include "verification/production/production_lottery.hpp"

diff --git a/app/integration/ProductionLotteryFactory.hpp b/app/integration/ProductionLotteryFactory.hpp
@@ -9,7 +9,7 @@
 
 #include "verification/production/impl/production_lottery_impl.hpp"
 #include "crypto/vrf_provider.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 
 class ProductionLotteryFactory
 {

diff --git a/app/integration/ProductionSynchronizerFactory.hpp b/app/integration/ProductionSynchronizerFactory.hpp
@@ -7,7 +7,7 @@
 #ifndef _PRODUCTION_SYNCHRONIZER_FACTORY_HPP_
 #define _PRODUCTION_SYNCHRONIZER_FACTORY_HPP_
 #include "verification/production/impl/production_synchronizer_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "application/configuration_storage.hpp"
 #include "blockchain/block_tree.hpp"
 #include "blockchain/block_header_repository.hpp"

diff --git a/app/integration/ProposerFactory.hpp b/app/integration/ProposerFactory.hpp
@@ -8,7 +8,7 @@
 #define _PROPOSER_FACTORY_HPP_
 
 #include "authorship/impl/proposer_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "transaction_pool/transaction_pool.hpp"
 
 class ProposerFactory

diff --git a/app/integration/TranscationPoolFactory.hpp b/app/integration/TranscationPoolFactory.hpp
@@ -8,7 +8,7 @@
 #define _TRANSACTION_POOL_FACTORY_HPP_
 
 #include "transaction_pool/impl/transaction_pool_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "transaction_pool/pool_moderator.hpp"
 #include "blockchain/block_header_repository.hpp"
 

diff --git a/app/integration/TrieSerializerFactory.hpp b/app/integration/TrieSerializerFactory.hpp
@@ -8,7 +8,7 @@
 #define _TRIE_SERIALIZER_FACTORY_HPP_
 
 #include "storage/trie/serialization/trie_serializer_impl.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 
 class TrieSerializerFactory
 {

diff --git a/app/integration/TrieStorageBackendFactory.hpp b/app/integration/TrieStorageBackendFactory.hpp
@@ -9,7 +9,7 @@
 #define _TRIE_STORAGE_BACKEND_FACTORY_HPP_
 #include "base/buffer.hpp"
 #include "blockchain/impl/storage_util.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "storage/trie/impl/trie_storage_backend_impl.hpp"
 
 class TrieStorageBackendFactory

diff --git a/app/integration/TrieStorageFactory.hpp b/app/integration/TrieStorageFactory.hpp
@@ -13,7 +13,7 @@
 #include "storage/trie/serialization/trie_serializer.hpp"
 #include "storage/changes_trie/changes_tracker.hpp"
 #include "application/configuration_storage.hpp"
-#include "integration/CComponentFactory.hpp"
+#include "singleton/CComponentFactory.hpp"
 #include "base/outcome_throw.hpp"
 
 class TrieStorageFactory

diff --git a/build/CommonBuildParameters.cmake b/build/CommonBuildParameters.cmake
@@ -300,6 +300,31 @@ set(AsyncIOManager_LIBRARY_DIR "${_THIRDPARTY_BUILD_DIR}/AsyncIOManager/lib")
 set(AsyncIOManager_DIR "${_THIRDPARTY_BUILD_DIR}/AsyncIOManager/lib/cmake/AsyncIOManager")
 find_package(AsyncIOManager CONFIG REQUIRED)
 include_directories(${AsyncIOManager_INCLUDE_DIR})
+include_directories(
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/algebra/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/block/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/codec/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/containers/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/hash/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/kdf/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/mac/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/math/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/marshalling/algebra/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/marshalling/core/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/marshalling/multiprecision/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/marshalling/zk/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/modes/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/multiprecision/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/passhash/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/pbkdf/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/pkpad/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/pubkey/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/random/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/stream/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/threshold/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/vdf/include"
+"${THIRDPARTY_DIR}/zkLLVM/libs/crypto3/libs/zk/include"
+)
 
 # --------------------------------------------------------
 # Set config of gnus_upnp
@@ -313,6 +338,9 @@ include_directories(${gnus_upnp_INCLUDE_DIR})
 include_directories(
     ${PROJECT_ROOT}/src
 )
+include_directories(
+    ${PROJECT_ROOT}/GeniusKDF
+)
 include_directories(
     ${PROJECT_ROOT}/app
 )
@@ -338,6 +366,9 @@ link_directories(
 
 add_subdirectory(${PROJECT_ROOT}/src ${CMAKE_BINARY_DIR}/src)
 
+add_subdirectory(${PROJECT_ROOT}/GeniusKDF ${CMAKE_BINARY_DIR}/GeniusKDF)
+
+
 # add_subdirectory(${PROJECT_ROOT}/app ${CMAKE_BINARY_DIR}/app)
 if(TESTING)
     enable_testing()
@@ -393,6 +424,8 @@ install_hfile(${PROJECT_ROOT}/src/transaction_pool)
 install_hfile(${PROJECT_ROOT}/src/verification)
 install_hfile(${PROJECT_ROOT}/src/account)
 install_hfile(${PROJECT_ROOT}/app/integration)
+install_hfile(${PROJECT_ROOT}/src/local_secure_storage)
+install_hfile(${PROJECT_ROOT}/src/singleton)
 
 # ## install proto header files ###
 install_hfile(${CMAKE_CURRENT_BINARY_DIR}/generated/crdt)

diff --git a/example/account_handling/AccountHelper.cpp b/example/account_handling/AccountHelper.cpp
@@ -5,7 +5,6 @@
  * @author     Henrique A. Klein ([email protected])
  */
 #include <boost/format.hpp>
-#include <boost/multiprecision/cpp_int.hpp>
 #include <rapidjson/document.h>
 #include "AccountHelper.hpp"
 #include "processing/processing_imagesplit.hpp"
@@ -42,9 +41,8 @@ static const std::string logger_config( R"(
 namespace sgns
 {
     AccountHelper::AccountHelper( const AccountKey2 &priv_key_data, const DevConfig_st2 &dev_config ) :
-        account_( std::make_shared<GeniusAccount>( uint256_t{ priv_key_data }, 0, 0 ) ), //
+        account_( std::make_shared<GeniusAccount>( 0 ) ), //
         io_( std::make_shared<boost::asio::io_context>() ),                              //
-        node_base_addr_( priv_key_data ),                                                //
         dev_config_( dev_config )                                                        //
     {
         logging_system = std::make_shared<soralog::LoggingSystem>( std::make_shared<soralog::ConfiguratorFromYAML>(
@@ -68,14 +66,14 @@ namespace sgns
         auto logNoise = sgns::base::createLogger( "Noise" );
         logNoise->set_level( spdlog::level::trace );
 
-        auto pubsubKeyPath = ( boost::format( "SuperGNUSNode.TestNet.%s/pubs_processor" ) % node_base_addr_ ).str();
+        auto pubsubKeyPath = ( boost::format( "SuperGNUSNode.TestNet.%s/pubs_processor" ) % account_->GetAddress<std::string>() ).str();
 
         pubsub_ = std::make_shared<ipfs_pubsub::GossipPubSub>(
             crdt::KeyPairFileStorage( pubsubKeyPath ).GetKeyPair().value() );
         pubsub_->Start( 40001, {} );
 
         globaldb_ = std::make_shared<crdt::GlobalDB>(
-            io_, ( boost::format( "SuperGNUSNode.TestNet.%s" ) % node_base_addr_ ).str(), 40010,
+            io_, ( boost::format( "SuperGNUSNode.TestNet.%s" ) % account_->GetAddress<std::string>() ).str(), 40010,
             std::make_shared<ipfs_pubsub::GossipPubSubTopic>( pubsub_, std::string( PROCESSING_CHANNEL ) ) );
 
         globaldb_->Init( crdt::CrdtOptions::DefaultOptions() );