Skip to content

Commit 261da80

Browse files
author
einhornimmond
committed
fix problems with empty transaction list
1 parent a355502 commit 261da80

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

src/cache/BlockIndex.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,10 @@ namespace cache {
369369
}
370370
uint32_t publicKeyIndex = 0;
371371
if (filter.involvedPublicKey && !filter.involvedPublicKey->isEmpty()) {
372-
publicKeyIndex = publicKeysDictionary.getIndexForString(filter.involvedPublicKey->copyAsString());
372+
auto involvedPublicKeyCopy = filter.involvedPublicKey->copyAsString();
373+
if (publicKeysDictionary.hasString(involvedPublicKeyCopy)) {
374+
publicKeyIndex = publicKeysDictionary.getIndexForString(involvedPublicKeyCopy);
375+
}
373376
}
374377
uint32_t coinCommunityKeyIndex = 0;
375378
if (!filter.coinCommunityId.empty()) {

src/cache/Exceptions.h

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ namespace cache {
4444
std::string getFullString() const;
4545

4646
protected:
47-
std::string mDictionaryName;
4847
std::string mKey;
4948
};
5049

src/model/Apollo/TransactionList.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ namespace model {
8080
}
8181
allTransactionsVector.clear();
8282
if (transactionsVector.empty()) {
83+
transactionList.AddMember("transactions", Value(kArrayType), alloc);
8384
return std::move(transactionList);
8485
}
8586

0 commit comments

Comments
 (0)