Skip to content

Commit

Permalink
version 5.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
cryptokatz committed Dec 6, 2018
1 parent 18acf8d commit 46d0508
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![image](https://github.com/ConcealNetwork/conceal-assets/blob/master/splash.png)

# Conceal Core (CLI)
Latest Release: v5.1.1
Latest Release: v5.1.5
Maintained by The Circle Team.

## Information
Expand Down Expand Up @@ -34,7 +34,9 @@ Conceal is open-source, community driven and truly decentralized. No one owns it

- `git clone https://github.com/ConcealNetwork/conceal-core`
- `cd conceal-core`
- `make build-release`
- `mkdir build && cd $_`
- `cmake ..`
- `make`

If the build is successful the binaries will be in the src folder.

Expand Down
6 changes: 3 additions & 3 deletions src/CryptoNoteCore/Blockchain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ bool Blockchain::handle_alternative_block(const Block& b, const Crypto::Hash& id
}

if (!m_checkpoints.is_alternative_block_allowed(getCurrentBlockchainHeight(), block_height)) {
logger(TRACE) << "Block with id: " << id << std::endl <<
logger(DEBUGGING) << "Block with id: " << id << std::endl <<
" can't be accepted for alternative chain, block height: " << block_height << std::endl <<
" blockchain height: " << getCurrentBlockchainHeight();

Expand All @@ -1109,7 +1109,7 @@ bool Blockchain::handle_alternative_block(const Block& b, const Crypto::Hash& id

size_t cumulativeSize;
if (!getBlockCumulativeSize(b, cumulativeSize)) {
logger(TRACE) << "Block with id: " << id << " has at least one unknown transaction. Cumulative size is calculated imprecisely";
logger(DEBUGGING) << "Block with id: " << id << " has at least one unknown transaction. Cumulative size is calculated imprecisely";
}

if (!checkCumulativeBlockSize(id, cumulativeSize, block_height)) {
Expand Down Expand Up @@ -2075,7 +2075,7 @@ bool Blockchain::pushBlock(const Block& blockData, const std::vector<Transaction

auto block_processing_time = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - blockProcessingStart).count();

logger(TRACE) <<
logger(DEBUGGING) <<
"+++++ Block added" << ENDL << "id:\t" << blockHash
<< ENDL << "PoW:\t" << proof_of_work
<< ENDL << "HEIGHT " << block.height << ", difficulty:\t" << currentDifficulty
Expand Down
2 changes: 1 addition & 1 deletion src/version.h.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define BUILD_COMMIT_ID "@VERSION@"
#define PROJECT_VERSION "5.1.4"
#define PROJECT_VERSION "5.1.5"
#define PROJECT_VERSION_BUILD_NO "Steganos 13"
#define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO "(" BUILD_COMMIT_ID ")"

0 comments on commit 46d0508

Please sign in to comment.