Skip to content

Commit c328dff

Browse files
authored
Merge pull request #709 from evoskuil/master
Add prevout table to defaults and config.
2 parents 37f728f + 922dada commit c328dff

File tree

2 files changed

+40
-16
lines changed

2 files changed

+40
-16
lines changed

src/chasers/chaser_validate.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,9 @@ void chaser_validate::validate_block(const header_link& link) NOEXCEPT
244244
{
245245
ec = error::validate6;
246246
}
247-
else if (query.set_filter_body(link, *block))
247+
else if (!query.set_filter_body(link, *block))
248248
{
249+
// TODO: this should not bypass checkpoint/milestone if enabled.
249250
ec = error::validate7;
250251
}
251252
else

src/parser.cpp

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,32 +80,32 @@ parser::parser(system::chain::selection context) NOEXCEPT
8080
configured.database.header_size = 20'397'669;
8181
configured.database.header_rate = 5;
8282

83-
configured.database.txs_buckets = 524'493;
84-
configured.database.txs_size = 999'581'257;
85-
configured.database.txs_rate = 5;
83+
configured.database.input_size = 90'116'786'234;
84+
configured.database.input_rate = 5;
8685

87-
configured.database.tx_buckets = 551'320'125;
88-
configured.database.tx_size = 15'435'744'998;
89-
configured.database.tx_rate = 5;
86+
configured.database.output_size = 24'315'563'831;
87+
configured.database.output_rate = 5;
9088

9189
configured.database.point_buckets = 546'188'501;
9290
configured.database.point_size = 8'389'074'978;
9391
configured.database.point_rate = 5;
9492

93+
configured.database.puts_size = 6'059'682'874;
94+
configured.database.puts_rate = 5;
95+
9596
configured.database.spend_buckets = 1'459'791'875;
9697
configured.database.spend_size = 15'364'630'530;
9798
configured.database.spend_rate = 5;
9899

99-
configured.database.puts_size = 6'059'682'874;
100-
configured.database.puts_rate = 5;
101-
102-
configured.database.input_size = 90'116'786'234;
103-
configured.database.input_rate = 5;
100+
configured.database.tx_buckets = 551'320'125;
101+
configured.database.tx_size = 15'435'744'998;
102+
configured.database.tx_rate = 5;
104103

105-
configured.database.output_size = 24'315'563'831;
106-
configured.database.output_rate = 5;
104+
configured.database.txs_buckets = 524'493;
105+
configured.database.txs_size = 999'581'257;
106+
configured.database.txs_rate = 5;
107107

108-
// metadata
108+
// indexes
109109

110110
configured.database.candidate_size = 2'523'423;
111111
configured.database.candidate_rate = 5;
@@ -117,6 +117,12 @@ parser::parser(system::chain::selection context) NOEXCEPT
117117
configured.database.strong_tx_size = 2'987'563'554;
118118
configured.database.strong_tx_rate = 5;
119119

120+
// caches
121+
122+
configured.database.prevout_buckets = 850'000;
123+
configured.database.prevout_size = 5'000'000;
124+
configured.database.prevout_rate = 5;
125+
120126
configured.database.validated_tx_buckets = 551'320'125;
121127
configured.database.validated_tx_size = 47'068'879;
122128
configured.database.validated_tx_rate = 5;
@@ -125,7 +131,7 @@ parser::parser(system::chain::selection context) NOEXCEPT
125131
configured.database.validated_bk_size = 8'290;
126132
configured.database.validated_bk_rate = 5;
127133

128-
// optional
134+
// optionals
129135

130136
configured.database.address_buckets = 0;
131137
configured.database.address_size = 1;
@@ -817,6 +823,23 @@ options_metadata parser::load_settings() THROWS
817823
"The percentage expansion of the strong_tx table body, defaults to '5'."
818824
)
819825

826+
/* prevout */
827+
(
828+
"database.prevout_buckets",
829+
value<uint32_t>(&configured.database.prevout_buckets),
830+
"The minimum number of buckets in the prevout table head, defaults to '850000'."
831+
)
832+
(
833+
"database.prevout_size",
834+
value<uint64_t>(&configured.database.prevout_size),
835+
"The minimum allocation of the prevout table body, defaults to '5000000'."
836+
)
837+
(
838+
"database.prevout_rate",
839+
value<uint16_t>(&configured.database.prevout_rate),
840+
"The percentage expansion of the prevout table and body, defaults to '5'."
841+
)
842+
820843
/* validated_tx */
821844
(
822845
"database.validated_tx_buckets",

0 commit comments

Comments
 (0)