Refactoring database usage

CMakeLists.txt

@@ -5,7 +5,6 @@ set(CMAKE_CXX_STANDARD 20)
 # initialize conan libs
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(NO_OUTPUT_DIRS KEEP_RPATHS)
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake)
@@ -67,6 +66,12 @@ endif()
 add_subdirectory(Simple-Web-Server)
 include_directories(Simple-Web-Server)
 
+add_subdirectory(Simple-WebSocket-Server)
+include_directories(Simple-WebSocket-Server)
+
+add_subdirectory(AshDB)
+include_directories(AshDB/include)
+
 add_subdirectory(src)
 
 if (BUILD_ASH_TESTS)

README.md

@@ -47,7 +47,7 @@ To create a `.sln` file, run the following commands from the root source directo
 mkdir build
 cd build
 conan install .. -s build_type=Debug --build missing
-cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_ASH_TESTS=On
+cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_ASH_TESTS=On -DASHDB_BUILD_CONAN=Off
 ```
 
 ### macos
@@ -58,7 +58,7 @@ This project has been compiled on macos 10.15 using Apple clang 11.0. I have bee
 mkdir build
 cd build
 conan install .. -s build_type=Debug --build missing
-cmake .. "-GNinja" -DCMAKE_BUILD_TYPE=Debug -DBUILD_ASH_TESTS=On
+cmake .. "-GNinja" -DCMAKE_BUILD_TYPE=Debug -DBUILD_ASH_TESTS=On -DASHDB_BUILD_CONAN=Off
 ```
 
 If there are no errors then the executable can be built with:

src/Block.cpp

@@ -40,6 +40,22 @@ void from_json(const nl::json& j, Block& b)
         BlockTime{std::chrono::milliseconds{j["time"].get<std::uint64_t>()}};
 }
 
+void to_json(nl::json& j, const BlockList& b)
+{
+    for (const auto& block : b)
+    {
+        j.push_back(block);
+    }
+}
+
+void from_json(const nl::json& j, BlockList& b)
+{
+    for (const auto& jblock : j.items())
+    {
+        b.push_back(jblock.value().get<Block>());
+    }
+}
+
 bool ValidHash(const Block& block)
 {
     const auto computedHash = CalculateBlockHash(block);
@@ -106,7 +122,6 @@ std::string CalculateBlockHash(const Block& block)
 }
 
 Block::Block(std::uint64_t index, std::string_view prevHash, Transactions&& txs)
-    : _logger(ash::initializeLogger("Block"))
 {
     _hashed._index = index;
     _hashed._nonce = 0;

src/Block.h

@@ -17,10 +17,14 @@ namespace ash
 class Block;
 using BlockSharedPtr = std::shared_ptr<Block>;
 using BlockUniquePtr = std::unique_ptr<Block>;
+using BlockList = std::vector<Block>;
 
 void to_json(nl::json& j, const Block& b);
 void from_json(const nl::json& j, Block& b);
 
+void to_json(nl::json& j, const BlockList& b);
+void from_json(const nl::json& j, BlockList& b);
+
 bool ValidHash(const Block& block);
 bool ValidNewBlock(const Block& block, const Block& prevblock);
 
@@ -36,13 +40,18 @@ std::string CalculateBlockHash(
 
 class Block 
 {
-    friend void read_block(std::istream& stream, Block& block);
-    friend void write_block(std::ostream& stream, const Block& block);
+    friend void ashdb_read(std::istream& stream, Block& block);
     friend void from_json(const nl::json& j, Block& b);
     friend class Miner;
 
 public:
     Block() = default;
+    Block(std::uint64_t index, std::string_view prevHash)
+        : Block(index, prevHash, {})
+    {
+        // nothing to do
+    }
+
     Block(std::uint64_t index, std::string_view prevHash, Transactions&& tx);
 
     bool operator==(const Block& other) const;
@@ -62,10 +71,20 @@ class Block
     std::string previousHash() const { return _hashed._prev; }
 
     const Transactions& transactions() const { return _hashed._txs; }
-    Transactions& transactions()
+    void add_transaction(Transaction&& tx)
     {
-        return const_cast<Transactions&>(
-            (static_cast<const Block*>(this))->transactions());
+        _hashed._txs.push_back(std::move(tx));
+    }
+
+    [[maybe_unused]] bool update_transaction(std::size_t index, const Transaction& tx)
+    {
+        if (index >= _hashed._txs.size())
+        {
+            return false;
+        }
+
+        _hashed._txs.at(index) = tx;
+        return true;
     }
 
     std::string hash() const { return _hash; }
@@ -97,7 +116,6 @@ class Block
 
     std::string     _hash;
     std::string     _miner;
-    SpdLogPtr       _logger;
 };
 
 } // namespace ash