Skip to content

[DB] Introduce EVO database #2271

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

Merged
furszy merged 20 commits into from
Apr 13, 2021
Merged

[DB] Introduce EVO database #2271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f3a7cfb
[Trivial] Remove unused variable in ProcessNewBlock
random-zebra Apr 11, 2021
da6a2c1
[Build] CMake: Introduce evo headers
random-zebra Mar 26, 2021
2496933
Implement CDBTransaction and CScopedDBTransaction
codablock Feb 14, 2018
d6c56d1
Introduce CEvoDB for all evo related things, e.g. DIP3
codablock May 24, 2018
ad7f5d7
[DB][BUG] Add virtual destructor for KeyValueHolder
random-zebra Mar 1, 2021
cab50d3
[Tests] Fix functional test suite with new directory 'evodb'
random-zebra Jan 25, 2021
be85c9a
[Refactoring] migrate evoDb to unique pointer
random-zebra Jan 27, 2021
fec56b0
[DB] Ensure evoDB consistency by storing best block hash
random-zebra Mar 18, 2021
e6c7efe
[Refactoring] Let Commit() return void
random-zebra Mar 18, 2021
6a36968
Implement 2-stage commit for CEvoDB to avoid inconsistencies
codablock Mar 6, 2019
34a7541
[Refactoring] Properly add explicit specifier where appropriate
random-zebra Mar 18, 2021
65b8ddc
[DB] Specialize CScopedDBTransaction for evo database
random-zebra Mar 18, 2021
cdd44d4
[Cleanup] Drop unneeded casts
random-zebra Mar 18, 2021
7094a60
Support passing CDataStream as key into CDBWrapper/CDBBatch/CDBIterator
codablock Apr 4, 2019
51920cb
Change CDBTransaction to compare keys by their serialized form
codablock Apr 4, 2019
f259774
Implement CDBTransactionIterator
codablock Apr 4, 2019
ed0d4f9
Track memory usage in CDBTransaction and CEvoDB
random-zebra Mar 18, 2021
304fc46
Take memory used by CEvoDB/CDBTransaction into account when flushing
random-zebra Mar 18, 2021
8850b3e
[Refactoring] Make CEvoDB mutex public
random-zebra Mar 18, 2021
c27bbed
[Cleanup] functions impl: branch on new line
random-zebra Mar 18, 2021
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
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ file(GLOB CONSENSUS_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/consensus/*.h)
file(GLOB CTAES_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/crypto/ctaes/*.h)
file(GLOB ZRUST_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/rust/include/*.h)
file(GLOB SAPLING_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/sapling/*.h)
file(GLOB EVO_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/evo/*.h)

source_group("BitcoinHeaders" FILES
${HEADERS}
Expand All @@ -189,6 +190,7 @@ source_group("BitcoinHeaders" FILES
${CTAES_HEADERS}
${ZRUST_HEADERS}
${SAPLING_HEADERS}
${EVO_HEADERS}
./src/support/cleanse.h
)

Expand Down Expand Up @@ -383,6 +385,7 @@ set(COMMON_SOURCES
./src/coins.cpp
./src/key_io.cpp
./src/compressor.cpp
./src/evo/evodb.cpp
./src/evo/specialtx.cpp
./src/consensus/merkle.cpp
./src/consensus/zerocoin_verify.cpp
Expand Down
2 changes: 2 additions & 0 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ BITCOIN_CORE_H = \
cuckoocache.h \
crypter.h \
cyclingvector.h \
evo/evodb.h \
evo/specialtx.h \
pairresult.h \
addressbook.h \
Expand Down Expand Up @@ -322,6 +323,7 @@ libbitcoin_server_a_SOURCES = \
consensus/params.cpp \
consensus/tx_verify.cpp \
consensus/zerocoin_verify.cpp \
evo/evodb.cpp \
evo/specialtx.cpp \
httprpc.cpp \
httpserver.cpp \
Expand Down
4 changes: 2 additions & 2 deletions src/budget/budgetproposal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ bool CBudgetProposal::ParseBroadcast(CDataStream& broadcast)
broadcast >> nBlockStart;
broadcast >> nBlockEnd;
broadcast >> nAmount;
broadcast >> *(CScriptBase*)(&address);
broadcast >> address;
broadcast >> nFeeTXHash;
} catch (std::exception& e) {
return error("Unable to deserialize proposal broadcast: %s", e.what());
Expand Down Expand Up @@ -338,7 +338,7 @@ CDataStream CBudgetProposal::GetBroadcast() const
broadcast << nBlockStart;
broadcast << nBlockEnd;
broadcast << nAmount;
broadcast << *(CScriptBase*)(&address);
broadcast << address;
broadcast << nFeeTXHash;
return broadcast;
}
Expand Down
2 changes: 1 addition & 1 deletion src/budget/budgetproposal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class CBudgetProposal
READWRITE(nBlockStart);
READWRITE(nBlockEnd);
READWRITE(nAmount);
READWRITE(*(CScriptBase*)(&address));
READWRITE(address);
READWRITE(nFeeTXHash);
READWRITE(nTime);
READWRITE(mapVotes);
Expand Down
2 changes: 1 addition & 1 deletion src/budget/finalizedbudget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ class CTxBudgetPayment
template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action)
{
READWRITE(*(CScriptBase*)(&payee));
READWRITE(payee);
READWRITE(nAmount);
READWRITE(nProposalHash);
}
Expand Down
Loading