Merge pull request #45 from aivve/dev/rpc_srv

Update with explorer and some bugfixes
Karbovanets · May 2, 2024 · c3c78f8 · c3c78f8
2 parents 20295e7 + 7a98663
commit c3c78f8
Show file tree

Hide file tree

Showing 39 changed files with 1,115 additions and 374 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -50,14 +50,14 @@ jobs:
           $asset_path = "./$build_folder/src/Release/$release_name.zip"
           mkdir "$release_name"
           cp *.exe "$release_name/"
-          echo "::set-output name=sha256::${sha256}"
-          echo "::set-output name=release_name::${release_name}.zip"
-          echo "::set-output name=asset_path::${asset_path}"
-          echo "::set-output name=krb_ver::${krb_ver}"
-          echo "::set-output name=artifact_path::$build_folder/src/Release/$release_name"
+          echo "sha256=${sha256}" >> $env:GITHUB_OUTPUT
+          echo "release_name=${release_name}.zip" >> $env:GITHUB_OUTPUT
+          echo "asset_path=${asset_path}" >> $env:GITHUB_OUTPUT
+          echo "krb_ver=${krb_ver}" >> $env:GITHUB_OUTPUT
+          echo "artifact_path=$build_folder/src/Release/$release_name" >> $env:GITHUB_OUTPUT
 
       - name: Upload To GH Artifacts
-        uses: actions/upload-artifact@v1.0.0
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.build.outputs.release_name }}
           path: ${{ steps.build.outputs.artifact_path }}
@@ -133,20 +133,20 @@ jobs:
           for f in src/*; do [[ -x $f && -f $f ]] && exeFiles+=( "$f" ); done
           strip "${exeFiles[@]}"
           cp "${exeFiles[@]}" "$release_name/"
-          echo "::set-output name=release_name::${release_name}"
-          echo "::set-output name=artifact_path::$build_folder/$release_name"
+          echo "release_name=${release_name}" >> $GITHUB_OUTPUT
+          echo "artifact_path=$build_folder/$release_name" >> $GITHUB_OUTPUT
 
       - name: Upload To GH Artifacts
-        uses: actions/upload-artifact@v1.0.0
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.build.outputs.release_name }}
           path: ${{ steps.build.outputs.artifact_path }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  build-ubuntu18:
-    name: Ubuntu 18.04
-    runs-on: ubuntu-18.04
+  build-ubuntu22:
+    name: Ubuntu 22.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@master
         with:
@@ -160,7 +160,7 @@ jobs:
           sudo apt install -y libboost-all-dev libssl-dev
           build_folder="build/release"
           krb_ver=${GITHUB_SHA::7}
-          release_name="Karbo-cli-ubuntu18.04-${krb_ver}"
+          release_name="Karbo-cli-ubuntu22.04-${krb_ver}"
           mkdir -p "$build_folder"
           cd "$build_folder"
           cmake -D ARCH=default -D CMAKE_BUILD_TYPE=Release -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true ../..
@@ -170,11 +170,11 @@ jobs:
           for f in src/*; do [[ -x $f && -f $f ]] && exeFiles+=( "$f" ); done
           strip "${exeFiles[@]}"
           cp "${exeFiles[@]}" "$release_name/"
-          echo "::set-output name=release_name::${release_name}"
-          echo "::set-output name=artifact_path::$build_folder/$release_name"
+          echo "release_name=${release_name}" >> $GITHUB_OUTPUT
+          echo "artifact_path=$build_folder/$release_name" >> $GITHUB_OUTPUT
 
       - name: Upload To GH Artifacts
-        uses: actions/upload-artifact@v1.0.0
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.build.outputs.release_name }}
           path: ${{ steps.build.outputs.artifact_path }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,10 +44,10 @@ jobs:
           Compress-Archive -Path *.exe -DestinationPath "$release_name.zip"
           $sha256 = (Get-FileHash "$release_name.zip").Hash
           $asset_path = "./$build_folder/src/Release/$release_name.zip"
-          echo "::set-output name=sha256::${sha256}"
-          echo "::set-output name=release_name::${release_name}.zip"
-          echo "::set-output name=asset_path::${asset_path}"
-          echo "::set-output name=krb_ver::${krb_ver}"
+          echo "sha256=${sha256}" >> $env:GITHUB_OUTPUT
+          echo "release_name=${release_name}.zip" >> $env:GITHUB_OUTPUT
+          echo "asset_path=${asset_path}" >> $env:GITHUB_OUTPUT
+          echo "krb_ver=${krb_ver}" >> $env:GITHUB_OUTPUT
 
       - name: Create Release
         uses: softprops/[email protected]
@@ -89,10 +89,10 @@ jobs:
           zip -r "$release_name".zip "$release_name"
           sha256=$(shasum -a 256 "$release_name".zip | awk '{print toupper($1)}')
           asset_path="./$build_folder$release_name.zip"
-          echo "::set-output name=sha256::${sha256}"
-          echo "::set-output name=release_name::${release_name}.zip"
-          echo "::set-output name=asset_path::${asset_path}"
-          echo "::set-output name=krb_ver::${krb_ver}"
+          echo "sha256=${sha256}" >> $GITHUB_OUTPUT
+          echo "release_name=${release_name}.zip" >> $GITHUB_OUTPUT
+          echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
+          echo "krb_ver=${krb_ver}" >> $GITHUB_OUTPUT
 
       - name: Create Release
         uses: softprops/[email protected]
@@ -105,9 +105,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  build-ubuntu18:
-    name: Ubuntu 18.04
-    runs-on: ubuntu-18.04
+  build-ubuntu22:
+    name: Ubuntu 22.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@master
         with:
@@ -121,7 +121,7 @@ jobs:
           sudo apt install -y libboost-all-dev libssl-dev
           build_folder="build/release"
           krb_ver=$(echo "$GITHUB_REF" | sed 's|refs/tags/||')
-          release_name="Karbo-cli-ubuntu18.04-${krb_ver}"
+          release_name="Karbo-cli-ubuntu22.04-${krb_ver}"
           mkdir -p "$build_folder"
           cd "$build_folder"
           cmake -D ARCH=default -D CMAKE_BUILD_TYPE=Release -D CMAKE_POSITION_INDEPENDENT_CODE:BOOL=true ../..
@@ -135,10 +135,10 @@ jobs:
           cd ..
           sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
           asset_path="./$build_folder/$release_name.tar.gz"
-          echo "::set-output name=sha256::${sha256}"
-          echo "::set-output name=release_name::${release_name}.tar.gz"
-          echo "::set-output name=asset_path::${asset_path}"
-          echo "::set-output name=krb_ver::${krb_ver}"
+          echo "sha256=${sha256}" >> $GITHUB_OUTPUT
+          echo "release_name=${release_name}.tar.gz" >> $GITHUB_OUTPUT
+          echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
+          echo "krb_ver=${krb_ver}" >> $GITHUB_OUTPUT
 
       - name: Create Release
         uses: softprops/[email protected]
@@ -181,10 +181,10 @@ jobs:
           cd ..
           sha256=$(shasum -a 256 "$release_name".tar.gz | awk '{print toupper($1)}')
           asset_path="./$build_folder/$release_name.tar.gz"
-          echo "::set-output name=sha256::${sha256}"
-          echo "::set-output name=release_name::${release_name}.tar.gz"
-          echo "::set-output name=asset_path::${asset_path}"
-          echo "::set-output name=krb_ver::${krb_ver}"
+          echo "sha256=${sha256}" >> $GITHUB_OUTPUT
+          echo "release_name=${release_name}.tar.gz" >> $GITHUB_OUTPUT
+          echo "asset_path=${asset_path}" >> $GITHUB_OUTPUT
+          echo "krb_ver=${krb_ver}" >> $GITHUB_OUTPUT
 
       - name: Create Release
         uses: softprops/[email protected]

diff --git a/external/linenoise/linenoise.hpp b/external/linenoise/linenoise.hpp
@@ -1683,8 +1683,7 @@ inline bool enableRawMode(int fd) {
     }
 
     GetConsoleMode(hIn, &consolemodeIn);
-    DWORD consolemodeInWithRaw = consolemodeIn & ~ENABLE_PROCESSED_INPUT;
-    SetConsoleMode(hIn, consolemodeInWithRaw);
+    SetConsoleMode(hIn, consolemodeIn & ~ENABLE_PROCESSED_INPUT);
 
     rawmode = true;
 #endif

diff --git a/src/AddressGenerator/vanitygen.cpp b/src/AddressGenerator/vanitygen.cpp
@@ -246,11 +246,6 @@ int main(int argc, char** argv) {
 
     System::Dispatcher dispatcher;
 
-#ifdef _WIN32
-    std::string consoletitle = std::string(CryptoNote::CRYPTONOTE_NAME) + " address generator v. " + std::string(PROJECT_VERSION_LONG);
-    SetConsoleTitleA(consoletitle.c_str());
-#endif
-
     std::string coinName(CryptoNote::CRYPTONOTE_NAME);
     std::cout << InformationMsg(coinName + " address generator v. " + std::string(PROJECT_VERSION)) << std::endl;
 

diff --git a/src/Common/ConsoleHandler.cpp b/src/Common/ConsoleHandler.cpp
@@ -137,7 +137,7 @@ bool AsyncConsoleReader::waitInput() {
 #else
   while (!m_stop.load(std::memory_order_relaxed))
   {
-    int retval = ::WaitForSingleObject(::GetStdHandle(STD_INPUT_HANDLE), 100);
+    DWORD retval = ::WaitForSingleObject(::GetStdHandle(STD_INPUT_HANDLE), 100);
     switch (retval)
     {
       case WAIT_FAILED:
@@ -188,7 +188,7 @@ void ConsoleHandler::unpause() {
 void ConsoleHandler::wait() {
 
   try {
-    if (m_thread.joinable()) {
+    if (m_thread.joinable() && m_thread.get_id() != std::this_thread::get_id()) {
       m_thread.join();
     }
   } catch (std::exception& e) {

diff --git a/src/Common/FormatTools.cpp b/src/Common/FormatTools.cpp
@@ -163,8 +163,8 @@ std::string formatAmount(uint64_t amount)
 {
     std::string s = std::to_string(amount);
     if (s.size() < numberOfDecimalPlaces + 1)
-	{
-		s.insert(0, numberOfDecimalPlaces + 1 - s.size(), '0');
+    {
+      s.insert(0, numberOfDecimalPlaces + 1 - s.size(), '0');
     }
     s.insert(s.size() - numberOfDecimalPlaces, ".");
     return s;
@@ -174,9 +174,8 @@ std::string formatAmount(int64_t amount)
 {
     std::string s = formatAmount(static_cast<uint64_t>(std::abs(amount)));
 
-    if (amount < 0)
-	{
-		s.insert(0, "-");
+    if (amount < 0) {
+      s.insert(0, "-");
     }
 
     return s;
@@ -224,39 +223,39 @@ std::string unixTimeToDate(const uint64_t timestamp)
 }
 
 bool parseAmount(const std::string& str, uint64_t& amount) {
-	std::string strAmount = str;
-	boost::algorithm::trim(strAmount);
-
-	size_t pointIndex = strAmount.find_first_of('.');
-	size_t fractionSize;
-	if (std::string::npos != pointIndex) {
-		fractionSize = strAmount.size() - pointIndex - 1;
-		while (numberOfDecimalPlaces < fractionSize && '0' == strAmount.back()) {
-			strAmount.erase(strAmount.size() - 1, 1);
-			--fractionSize;
-		}
-		if (numberOfDecimalPlaces < fractionSize) {
-			return false;
-		}
-		strAmount.erase(pointIndex, 1);
-	}
-	else {
-		fractionSize = 0;
-	}
-
-	if (strAmount.empty()) {
-		return false;
-	}
-
-	if (!std::all_of(strAmount.begin(), strAmount.end(), ::isdigit)) {
-		return false;
-	}
-
-	if (fractionSize < numberOfDecimalPlaces) {
-		strAmount.append(numberOfDecimalPlaces - fractionSize, '0');
-	}
-
-	return Common::fromString(strAmount, amount);
+  std::string strAmount = str;
+  boost::algorithm::trim(strAmount);
+
+  size_t pointIndex = strAmount.find_first_of('.');
+  size_t fractionSize;
+  if (std::string::npos != pointIndex) {
+    fractionSize = strAmount.size() - pointIndex - 1;
+    while (numberOfDecimalPlaces < fractionSize && '0' == strAmount.back()) {
+      strAmount.erase(strAmount.size() - 1, 1);
+      --fractionSize;
+    }
+    if (numberOfDecimalPlaces < fractionSize) {
+      return false;
+    }
+    strAmount.erase(pointIndex, 1);
+  }
+  else {
+    fractionSize = 0;
+  }
+
+  if (strAmount.empty()) {
+    return false;
+  }
+
+  if (!std::all_of(strAmount.begin(), strAmount.end(), ::isdigit)) {
+    return false;
+  }
+
+  if (fractionSize < numberOfDecimalPlaces) {
+    strAmount.append(numberOfDecimalPlaces - fractionSize, '0');
+  }
+
+  return Common::fromString(strAmount, amount);
 }
 
 } // namespace Common
diff --git a/src/Common/FormatTools.h b/src/Common/FormatTools.h
@@ -19,10 +19,10 @@ namespace Common
         const uint64_t target_height);
 
     std::string formatAmountWithTicker(const uint64_t amount);
-
-	std::string formatAmount(uint64_t amount);
 
-	std::string formatAmount(int64_t amount);
+    std::string formatAmount(uint64_t amount);
+
+    std::string formatAmount(int64_t amount);
 
     std::string formatAmountBasic(const uint64_t amount);
 

diff --git a/src/Common/Math.h b/src/Common/Math.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <algorithm>
+#include <limits>
 #include <vector>
 #include "StringTools.h"
 

diff --git a/src/CryptoNoteCore/Core.cpp b/src/CryptoNoteCore/Core.cpp
@@ -485,6 +485,9 @@ void Core::getTransactions(const std::vector<Crypto::Hash>& transactionHashes, s
   assert(segment != nullptr);
 
   std::vector<Crypto::Hash> leftTransactions = transactionHashes;
+  if (leftTransactions.empty()) {
+    return;
+  }
 
   // find in main chain
   do {

diff --git a/src/CryptoNoteCore/UpgradeDetector.h b/src/CryptoNoteCore/UpgradeDetector.h
@@ -29,6 +29,8 @@
 #include "CryptoNoteConfig.h"
 #include <Logging/LoggerRef.h>
 
+#undef ERROR
+
 namespace CryptoNote {
   class UpgradeDetectorBase {
   public:

diff --git a/src/CryptoNoteProtocol/CryptoNoteProtocolHandler.cpp b/src/CryptoNoteProtocol/CryptoNoteProtocolHandler.cpp
@@ -492,7 +492,7 @@ int CryptoNoteProtocolHandler::handle_notify_new_transactions(int command, NOTIF
               if (!post_notify<NOTIFY_NEW_TRANSACTIONS>(*m_p2p, arg, dandelion_peer)) {
                 arg.stem = false;
                 logger(Logging::DEBUGGING) << "Failed to relay transactions to Dandelion peer " 
-                  << dandelion_peer.m_connection_id << ", remove from stempool and broadcast as fluff:";
+                  << dandelion_peer.m_remote_ip << ", remove from stempool and broadcast as fluff:";
                 for (const auto& h : txHashes) {
                   m_stemPool.removeTransaction(h);
                   logger(Logging::DEBUGGING) << h;
@@ -1123,9 +1123,7 @@ void CryptoNoteProtocolHandler::relayTransactions(const std::vector<BinaryArray>
       if (!m_stemPool.hasTransaction(transactionHash)) {
         logger(Logging::DEBUGGING) << "Adding relayed transaction " << transactionHash << " to stempool";
         BinaryArray txblob = *tx_blob_it;
-        m_dispatcher.remoteSpawn([this, transactionHash, txblob] {
-          m_stemPool.addTransaction(transactionHash, txblob);
-        });
+        m_stemPool.addTransaction(transactionHash, txblob);
         txHashes.push_back(transactionHash);
       }
     }
@@ -1138,7 +1136,7 @@ void CryptoNoteProtocolHandler::relayTransactions(const std::vector<BinaryArray>
         if (dandelion_peer.m_state == CryptoNoteConnectionContext::state_normal || dandelion_peer.m_state == CryptoNoteConnectionContext::state_synchronizing) {
           if (!post_notify<NOTIFY_NEW_TRANSACTIONS>(*m_p2p, r, dandelion_peer)) {
             logger(Logging::WARNING, Logging::BRIGHT_YELLOW) << "Failed to relay transactions to Dandelion peer " 
-              << dandelion_peer.m_connection_id << ", broadcasting in dandelion fluff mode";
+              << dandelion_peer.m_remote_ip << ", broadcasting in dandelion fluff mode";
             r.stem = false;
             for (const auto& h : txHashes) {
               m_stemPool.removeTransaction(h);