Skip to content

Commit

Permalink
Merge pull request #2838 from Taraxa-project/master
Browse files Browse the repository at this point in the history
1.11.3 to develop
MatusKysel authored Aug 23, 2024

Verified

This commit was signed with the committer’s verified signature.
stanhu Stan Hu
2 parents 6a94d03 + 05f94e6 commit 6829fdb
Showing 3 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.20)
# Set current version of the project
set(TARAXA_MAJOR_VERSION 1)
set(TARAXA_MINOR_VERSION 11)
set(TARAXA_PATCH_VERSION 2)
set(TARAXA_PATCH_VERSION 3)
set(TARAXA_VERSION ${TARAXA_MAJOR_VERSION}.${TARAXA_MINOR_VERSION}.${TARAXA_PATCH_VERSION})

# Any time a change in the network protocol is introduced this version should be increased
11 changes: 0 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -44,14 +44,3 @@ participate you are more than welcome. You can start by reading [contributing tu
- [Git practices](doc/git_practices.md)
- [Coding practices](doc/coding_practices.md)
- [EVM incompatibilities](doc/evm_incompatibilities.md)


# System Requirements
For a full web node, you need at least ...GB of disk space available.
The block log of the blockchain itself is a little over ...GB.
It's highly recommended to run taraxad on a fast disk such as an SSD.
At least ...GB of memory is required for a full web node.
Any CPU with decent single core performance should be sufficient.
Taraxa is constantly growing, so you may find you need more disk space to run a full node.
We are also constantly working on optimizing Taraxa's use of disk space.
```
2 changes: 0 additions & 2 deletions libraries/core_libs/storage/src/storage.cpp
Original file line number Diff line number Diff line change
@@ -620,7 +620,6 @@ void DbStorage::clearPeriodDataHistory(PbftPeriod end_period, uint64_t dag_level
for (const auto& dag_block : dag_blocks) {
for (const auto& trx_hash : dag_block->getTrxs()) {
remove(write_batch, Columns::final_chain_receipt_by_trx_hash, trx_hash);
remove(write_batch, Columns::trx_period, toSlice(trx_hash.asBytes()));
}
}
remove(write_batch, Columns::pbft_block_period, toSlice(pbft_block_hash.asBytes()));
@@ -646,7 +645,6 @@ void DbStorage::clearPeriodDataHistory(PbftPeriod end_period, uint64_t dag_level
db_->CompactRange({}, handle(Columns::period_data), &start_slice, &end_slice);
db_->CompactRange({}, handle(Columns::pillar_block), &start_slice, &end_slice);
db_->CompactRange({}, handle(Columns::final_chain_receipt_by_trx_hash), nullptr, nullptr);
db_->CompactRange({}, handle(Columns::trx_period), nullptr, nullptr);
db_->CompactRange({}, handle(Columns::pbft_block_period), nullptr, nullptr);
db_->CompactRange({}, handle(Columns::final_chain_log_blooms_index), nullptr, nullptr);
}

0 comments on commit 6829fdb

Please sign in to comment.