Skip to content

Commit 3bc7a3a

Browse files
evoskuilevoskuil
authored
Merge pull request #715 from evoskuil/master
First cut on fee estimation.
2 parents 1ef3799 + 079150f commit 3bc7a3a

File tree

92 files changed

+285
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+285
-155
lines changed

‎Makefile.am‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,14 @@ test_libbitcoin_database_test_SOURCES = \
9191
test/query/confirm.cpp \
9292
test/query/consensus.cpp \
9393
test/query/context.cpp \
94+
test/query/estimate.cpp \
9495
test/query/extent.cpp \
9596
test/query/height.cpp \
9697
test/query/initialize.cpp \
98+
test/query/merkle.cpp \
9799
test/query/network.cpp \
98100
test/query/objects.cpp \
99101
test/query/optional.cpp \
100-
test/query/services.cpp \
101102
test/query/translate.cpp \
102103
test/query/validate.cpp \
103104
test/tables/archives/header.cpp \
@@ -181,14 +182,15 @@ include_bitcoin_database_impl_query_HEADERS = \
181182
include/bitcoin/database/impl/query/confirm.ipp \
182183
include/bitcoin/database/impl/query/consensus.ipp \
183184
include/bitcoin/database/impl/query/context.ipp \
185+
include/bitcoin/database/impl/query/estimate.ipp \
184186
include/bitcoin/database/impl/query/extent.ipp \
185187
include/bitcoin/database/impl/query/height.ipp \
186188
include/bitcoin/database/impl/query/initialize.ipp \
189+
include/bitcoin/database/impl/query/merkle.ipp \
187190
include/bitcoin/database/impl/query/network.ipp \
188191
include/bitcoin/database/impl/query/objects.ipp \
189192
include/bitcoin/database/impl/query/optional.ipp \
190193
include/bitcoin/database/impl/query/query.ipp \
191-
include/bitcoin/database/impl/query/services.ipp \
192194
include/bitcoin/database/impl/query/translate.ipp \
193195
include/bitcoin/database/impl/query/validate.ipp
194196

‎builds/cmake/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,13 +301,14 @@ if (with-tests)
301301
"../../test/query/confirm.cpp"
302302
"../../test/query/consensus.cpp"
303303
"../../test/query/context.cpp"
304+
"../../test/query/estimate.cpp"
304305
"../../test/query/extent.cpp"
305306
"../../test/query/height.cpp"
306307
"../../test/query/initialize.cpp"
308+
"../../test/query/merkle.cpp"
307309
"../../test/query/network.cpp"
308310
"../../test/query/objects.cpp"
309311
"../../test/query/optional.cpp"
310-
"../../test/query/services.cpp"
311312
"../../test/query/translate.cpp"
312313
"../../test/query/validate.cpp"
313314
"../../test/tables/archives/header.cpp"

‎builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,16 @@
152152
<ClCompile Include="..\..\..\..\test\query\confirm.cpp" />
153153
<ClCompile Include="..\..\..\..\test\query\consensus.cpp" />
154154
<ClCompile Include="..\..\..\..\test\query\context.cpp" />
155+
<ClCompile Include="..\..\..\..\test\query\estimate.cpp" />
155156
<ClCompile Include="..\..\..\..\test\query\extent.cpp" />
156157
<ClCompile Include="..\..\..\..\test\query\height.cpp">
157158
<ObjectFileName>$(IntDir)test_query_height.obj</ObjectFileName>
158159
</ClCompile>
159160
<ClCompile Include="..\..\..\..\test\query\initialize.cpp" />
161+
<ClCompile Include="..\..\..\..\test\query\merkle.cpp" />
160162
<ClCompile Include="..\..\..\..\test\query\network.cpp" />
161163
<ClCompile Include="..\..\..\..\test\query\objects.cpp" />
162164
<ClCompile Include="..\..\..\..\test\query\optional.cpp" />
163-
<ClCompile Include="..\..\..\..\test\query\services.cpp" />
164165
<ClCompile Include="..\..\..\..\test\query\translate.cpp" />
165166
<ClCompile Include="..\..\..\..\test\query\validate.cpp" />
166167
<ClCompile Include="..\..\..\..\test\settings.cpp" />

‎builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@
123123
<ClCompile Include="..\..\..\..\test\query\context.cpp">
124124
<Filter>src\query</Filter>
125125
</ClCompile>
126+
<ClCompile Include="..\..\..\..\test\query\estimate.cpp">
127+
<Filter>src\query</Filter>
128+
</ClCompile>
126129
<ClCompile Include="..\..\..\..\test\query\extent.cpp">
127130
<Filter>src\query</Filter>
128131
</ClCompile>
@@ -132,6 +135,9 @@
132135
<ClCompile Include="..\..\..\..\test\query\initialize.cpp">
133136
<Filter>src\query</Filter>
134137
</ClCompile>
138+
<ClCompile Include="..\..\..\..\test\query\merkle.cpp">
139+
<Filter>src\query</Filter>
140+
</ClCompile>
135141
<ClCompile Include="..\..\..\..\test\query\network.cpp">
136142
<Filter>src\query</Filter>
137143
</ClCompile>
@@ -141,9 +147,6 @@
141147
<ClCompile Include="..\..\..\..\test\query\optional.cpp">
142148
<Filter>src\query</Filter>
143149
</ClCompile>
144-
<ClCompile Include="..\..\..\..\test\query\services.cpp">
145-
<Filter>src\query</Filter>
146-
</ClCompile>
147150
<ClCompile Include="..\..\..\..\test\query\translate.cpp">
148151
<Filter>src\query</Filter>
149152
</ClCompile>

‎builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,14 +219,15 @@
219219
<None Include="..\..\..\..\include\bitcoin\database\impl\query\confirm.ipp" />
220220
<None Include="..\..\..\..\include\bitcoin\database\impl\query\consensus.ipp" />
221221
<None Include="..\..\..\..\include\bitcoin\database\impl\query\context.ipp" />
222+
<None Include="..\..\..\..\include\bitcoin\database\impl\query\estimate.ipp" />
222223
<None Include="..\..\..\..\include\bitcoin\database\impl\query\extent.ipp" />
223224
<None Include="..\..\..\..\include\bitcoin\database\impl\query\height.ipp" />
224225
<None Include="..\..\..\..\include\bitcoin\database\impl\query\initialize.ipp" />
226+
<None Include="..\..\..\..\include\bitcoin\database\impl\query\merkle.ipp" />
225227
<None Include="..\..\..\..\include\bitcoin\database\impl\query\network.ipp" />
226228
<None Include="..\..\..\..\include\bitcoin\database\impl\query\objects.ipp" />
227229
<None Include="..\..\..\..\include\bitcoin\database\impl\query\optional.ipp" />
228230
<None Include="..\..\..\..\include\bitcoin\database\impl\query\query.ipp" />
229-
<None Include="..\..\..\..\include\bitcoin\database\impl\query\services.ipp" />
230231
<None Include="..\..\..\..\include\bitcoin\database\impl\query\translate.ipp" />
231232
<None Include="..\..\..\..\include\bitcoin\database\impl\query\validate.ipp" />
232233
<None Include="..\..\..\..\include\bitcoin\database\impl\store.ipp" />

‎builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,9 @@
346346
<None Include="..\..\..\..\include\bitcoin\database\impl\query\context.ipp">
347347
<Filter>include\bitcoin\database\impl\query</Filter>
348348
</None>
349+
<None Include="..\..\..\..\include\bitcoin\database\impl\query\estimate.ipp">
350+
<Filter>include\bitcoin\database\impl\query</Filter>
351+
</None>
349352
<None Include="..\..\..\..\include\bitcoin\database\impl\query\extent.ipp">
350353
<Filter>include\bitcoin\database\impl\query</Filter>
351354
</None>
@@ -355,6 +358,9 @@
355358
<None Include="..\..\..\..\include\bitcoin\database\impl\query\initialize.ipp">
356359
<Filter>include\bitcoin\database\impl\query</Filter>
357360
</None>
361+
<None Include="..\..\..\..\include\bitcoin\database\impl\query\merkle.ipp">
362+
<Filter>include\bitcoin\database\impl\query</Filter>
363+
</None>
358364
<None Include="..\..\..\..\include\bitcoin\database\impl\query\network.ipp">
359365
<Filter>include\bitcoin\database\impl\query</Filter>
360366
</None>
@@ -367,9 +373,6 @@
367373
<None Include="..\..\..\..\include\bitcoin\database\impl\query\query.ipp">
368374
<Filter>include\bitcoin\database\impl\query</Filter>
369375
</None>
370-
<None Include="..\..\..\..\include\bitcoin\database\impl\query\services.ipp">
371-
<Filter>include\bitcoin\database\impl\query</Filter>
372-
</None>
373376
<None Include="..\..\..\..\include\bitcoin\database\impl\query\translate.ipp">
374377
<Filter>include\bitcoin\database\impl\query</Filter>
375378
</None>

‎include/bitcoin/database/error.hpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,15 @@ enum error_t : uint8_t
145145
txs_confirm,
146146
txs_txs_put,
147147

148-
/// optional
148+
/// services
149+
not_found,
150+
empty_block,
151+
query_canceled,
152+
invalid_argument,
153+
missing_prevouts,
149154
merkle_proof,
150155
merkle_interval,
151-
merkle_hashes,
152-
merkle_arguments,
153-
merkle_not_found
156+
merkle_hashes
154157
};
155158

156159
// No current need for error_code equivalence mapping.

‎include/bitcoin/database/file/rotator.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
#include <memory>
2323
#include <filesystem>
24-
#include <bitcoin/system.hpp>
2524
#include <bitcoin/database/define.hpp>
2625
#include <bitcoin/database/file/utilities.hpp>
2726

‎include/bitcoin/database/file/utilities.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#define LIBBITCOIN_DATABASE_FILE_UTILITIES_HPP
2121

2222
#include <filesystem>
23-
#include <bitcoin/system.hpp>
2423
#include <bitcoin/database/define.hpp>
2524

2625
namespace libbitcoin {

‎include/bitcoin/database/impl/memory/accessor.ipp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#define LIBBITCOIN_DATABASE_MEMORY_ACCESSOR_IPP
2121

2222
////#include <iterator>
23-
#include <bitcoin/system.hpp>
2423
#include <bitcoin/database/define.hpp>
2524

2625
// Zero/negative size is allowed (automatically handled by bc streams).

0 commit comments

Comments
 (0)