Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/skale 3422 add blake3 to consensus #284

Merged
merged 4 commits into from
Oct 29, 2020
Merged

Feature/skale 3422 add blake3 to consensus #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
966328a
SKALE-3422-use-blake-3
kladkogex Oct 29, 2020
b5059a3
SKALE-3422-use-blake-3
kladkogex Oct 29, 2020
61a261b
SKALE-3422-use-blake-3
kladkogex Oct 29, 2020
82b1067
Merge branch 'develop' into feature/SKALE-3422-add-blake3-to-consensus
kladkogex Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions SkaleCommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
119 changes: 0 additions & 119 deletions crypto/SHAHash.cpp
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions crypto/SHAHash.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion network/Buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down