Merge branch 'master' into dev/legacy_http

# Conflicts: # src/JsonRpcServer/JsonRpcServer.cpp # src/PaymentGateService/PaymentGateService.cpp # src/Wallet/WalletRpcServer.cpp
aivve · Sep 2, 2024 · ec1f26e · ec1f26e
2 parents d77ade0 + abf97f2
commit ec1f26e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,6 +52,7 @@ jobs:
         with:
           files: ${{ steps.build.outputs.asset_path }}
           name: Karbo CLI Suite ${{ steps.build.outputs.krb_ver }}
+          append_body: true
           body: |
             [Download for Windows](../../releases/download/${{ steps.build.outputs.krb_ver }}/${{ steps.build.outputs.release_name }}) `SHA256: ${{ steps.build.outputs.sha256 }}`
         env:
@@ -94,6 +95,7 @@ jobs:
         with:
           files: ${{ steps.build.outputs.asset_path }}
           name: Karbo CLI Suite ${{ steps.build.outputs.krb_ver }}
+          append_body: true
           body: |
             [Download for macOS](../../releases/download/${{ steps.build.outputs.krb_ver }}/${{ steps.build.outputs.release_name }}) `SHA256: ${{ steps.build.outputs.sha256 }}`
         env:
@@ -138,6 +140,7 @@ jobs:
         with:
           files: ${{ steps.build.outputs.asset_path }}
           name: Karbo CLI Suite ${{ steps.build.outputs.krb_ver }}
+          append_body: true
           body: |
             [Download for Ubuntu 22.04](../../releases/download/${{ steps.build.outputs.krb_ver }}/${{ steps.build.outputs.release_name }}) `SHA256: ${{ steps.build.outputs.sha256 }}`
         env:
@@ -182,6 +185,7 @@ jobs:
         with:
           files: ${{ steps.build.outputs.asset_path }}
           name: Karbo CLI Suite ${{ steps.build.outputs.krb_ver }}
+          append_body: true
           body: |
             [Download for Ubuntu 20.04](../../releases/download/${{ steps.build.outputs.krb_ver }}/${{ steps.build.outputs.release_name }}) `SHA256: ${{ steps.build.outputs.sha256 }}`
         env:

diff --git a/src/CryptoNoteProtocol/CryptoNoteProtocolHandler.cpp b/src/CryptoNoteProtocol/CryptoNoteProtocolHandler.cpp
@@ -1097,9 +1097,7 @@ void CryptoNoteProtocolHandler::relay_transactions(NOTIFY_NEW_TRANSACTIONS::requ
       if (!m_stemPool.hasTransaction(transactionHash)) {
         logger(Logging::DEBUGGING) << "Adding relayed transaction " << transactionHash << " to stempool";
         auto txblob = *tx_blob_it;
-        //m_dispatcher.remoteSpawn([this, transactionHash, txblob] {
           m_stemPool.addTransaction(transactionHash, txblob);
-        //});
         txHashes.push_back(transactionHash);
       }
     }