ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-04 11:15:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the correct root hash for the tx tree

Browse Source
This commit is contained in:
seelabs
2020-08-07 11:52:24 -04:00
committed by manojsdoshi
parent e5d17a9452
commit 7bb6b75f3c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ripple/app/ledger/impl/InboundLedger.cpp
View File

@@ -928,15 +928,17 @@ InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san)
return;
}
auto [map, filter] =
[&]() -> std::pair<SHAMap&, std::unique_ptr<SHAMapSyncFilter>> {
auto [map, rootHash, filter] = [&]()
-> std::tuple<SHAMap&, SHAMapHash, std::unique_ptr<SHAMapSyncFilter>> {
if (packet.type() == protocol::liTX_NODE)
return {
mLedger->txMap(),
SHAMapHash{mLedger->info().txHash},
std::make_unique<TransactionStateSF>(
mLedger->txMap().family().db(), app_.getLedgerMaster())};
return {
mLedger->stateMap(),
SHAMapHash{mLedger->info().accountHash},
std::make_unique<AccountStateSF>(
mLedger->stateMap().family().db(), app_.getLedgerMaster())};
}();
@@ -949,9 +951,7 @@ InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san)
node.nodeid().data(), node.nodeid().size());
if (nodeID.isRoot())
san += map.addRootNode(
SHAMapHash{mLedger->info().accountHash},
makeSlice(node.nodedata()),
filter.get());
rootHash, makeSlice(node.nodedata()), filter.get());
else
san += map.addKnownNode(
nodeID, makeSlice(node.nodedata()), filter.get());