Merge pull request #284 from skalenetwork/feature/SKALE-3422-add-blak…

…e3-to-consensus Feature/skale 3422 add blake3 to consensus
skalenetwork · Oct 29, 2020 · 508510a · 508510a
2 parents a5d404c + 82b1067
commit 508510a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 187 deletions.
diff --git a/SkaleCommon.h b/SkaleCommon.h
@@ -153,15 +153,13 @@ static const uint64_t MAX_CONSENSUS_HISTORY  = 2 * MAX_ACTIVE_CONSENSUSES;
 static const uint64_t SESSION_KEY_CACHE_SIZE  = 2;
 static const uint64_t SESSION_PUBLIC_KEY_CACHE_SIZE  = 16;
 
-
-
 static constexpr uint64_t MAX_CATCHUP_DOWNLOAD_BYTES = 1000000000;
 
 static constexpr uint64_t PROPOSAL_HASHES_PER_DB = 100000;
 
 static constexpr uint64_t MAX_TRANSACTIONS_PER_BLOCK = 10000;
 
-static constexpr int64_t EMPTY_BLOCK_INTERVAL_MS = 3000;
+static constexpr int64_t EMPTY_BLOCK_INTERVAL_MS = 1;
 
 static constexpr uint64_t MIN_BLOCK_INTERVAL_MS = 1;
 
@@ -175,7 +173,6 @@ static constexpr uint64_t WAIT_AFTER_NETWORK_ERROR_MS = 3000;
 
 static constexpr uint64_t CONNECTION_REFUSED_LOG_INTERVAL_MS = 10 * 60 * 1000;
 
-
 // Non-tunable params
 
 static constexpr uint32_t SOCKET_BACKLOG = 64;
@@ -303,7 +300,7 @@ static const uint64_t  MAX_PROPOSAL_QUEUE_SIZE = 8;
 
 static const uint64_t SGX_SSL_PORT = 1026;
 
-static const uint64_t BLOCK_PROPOSAL_RECEIVE_TIMEOUT_MS = 120000;
+static const uint64_t BLOCK_PROPOSAL_RECEIVE_TIMEOUT_MS = 30000;
 
 static const uint64_t REBROADCAST_TIMEOUT_MS = 120000;
 

diff --git a/crypto/SHAHash.cpp b/crypto/SHAHash.cpp
diff --git a/crypto/SHAHash.h b/crypto/SHAHash.h
diff --git a/network/Buffer.cpp b/network/Buffer.cpp
@@ -61,7 +61,6 @@ Buffer::Buffer(size_t _size) {
     }
     this->size = _size;
     buf = make_shared<vector<uint8_t>>(size);
-    std::fill(buf->begin(), buf->end(), 0);
 }
 
 size_t Buffer::getSize() const {