Skip to content

Commit 957e558

Browse files
evoskuilevoskuil
authored
Merge pull request #808 from evoskuil/master
Add multisig_view class, increase batch tables key size.
2 parents cc2ee5d + 1c33c87 commit 957e558

26 files changed

Lines changed: 401 additions & 26 deletions

‎Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ src_libbitcoin_database_la_SOURCES = \
4848
src/memory/mman-win32/mman.cpp \
4949
src/memory/mman-win32/mman.hpp \
5050
src/types/history.cpp \
51+
src/types/multisig_view.cpp \
5152
src/types/unspent.cpp
5253

5354
# local: test/libbitcoin-database-test
@@ -136,6 +137,7 @@ test_libbitcoin_database_test_SOURCES = \
136137
test/tables/archives/txs.cpp \
137138
test/tables/caches/duplicate.cpp \
138139
test/tables/caches/ecdsa.cpp \
140+
test/tables/caches/multisig.cpp \
139141
test/tables/caches/prevout.cpp \
140142
test/tables/caches/schnorr.cpp \
141143
test/tables/caches/validated_bk.cpp \
@@ -321,6 +323,7 @@ include_bitcoin_database_tables_cachesdir = ${includedir}/bitcoin/database/table
321323
include_bitcoin_database_tables_caches_HEADERS = \
322324
include/bitcoin/database/tables/caches/duplicate.hpp \
323325
include/bitcoin/database/tables/caches/ecdsa.hpp \
326+
include/bitcoin/database/tables/caches/multisig.hpp \
324327
include/bitcoin/database/tables/caches/prevout.hpp \
325328
include/bitcoin/database/tables/caches/schnorr.hpp \
326329
include/bitcoin/database/tables/caches/validated_bk.hpp \
@@ -342,6 +345,7 @@ include_bitcoin_database_types_HEADERS = \
342345
include/bitcoin/database/types/fee_rate.hpp \
343346
include/bitcoin/database/types/header_state.hpp \
344347
include/bitcoin/database/types/history.hpp \
348+
include/bitcoin/database/types/multisig_view.hpp \
345349
include/bitcoin/database/types/position.hpp \
346350
include/bitcoin/database/types/span.hpp \
347351
include/bitcoin/database/types/type.hpp \

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@
198198
<ClCompile Include="..\..\..\..\test\tables\archives\txs.cpp" />
199199
<ClCompile Include="..\..\..\..\test\tables\caches\duplicate.cpp" />
200200
<ClCompile Include="..\..\..\..\test\tables\caches\ecdsa.cpp" />
201+
<ClCompile Include="..\..\..\..\test\tables\caches\multisig.cpp" />
201202
<ClCompile Include="..\..\..\..\test\tables\caches\prevout.cpp" />
202203
<ClCompile Include="..\..\..\..\test\tables\caches\schnorr.cpp" />
203204
<ClCompile Include="..\..\..\..\test\tables\caches\validated_bk.cpp" />

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@
270270
<ClCompile Include="..\..\..\..\test\tables\caches\ecdsa.cpp">
271271
<Filter>src\tables\caches</Filter>
272272
</ClCompile>
273+
<ClCompile Include="..\..\..\..\test\tables\caches\multisig.cpp">
274+
<Filter>src\tables\caches</Filter>
275+
</ClCompile>
273276
<ClCompile Include="..\..\..\..\test\tables\caches\prevout.cpp">
274277
<Filter>src\tables\caches</Filter>
275278
</ClCompile>

‎builds/msvc/vs2022/libbitcoin-database-test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
1414
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
1515
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
16+
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />
1617
<package id="boost_url-vc143" version="1.86.0" targetFramework="Native" />
1718
<package id="secp256k1_vc143" version="0.6.1" targetFramework="Native" />
18-
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />
1919
</packages>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
</ClCompile>
140140
<ClCompile Include="..\..\..\..\src\settings.cpp" />
141141
<ClCompile Include="..\..\..\..\src\types\history.cpp" />
142+
<ClCompile Include="..\..\..\..\src\types\multisig_view.cpp" />
142143
<ClCompile Include="..\..\..\..\src\types\unspent.cpp" />
143144
</ItemGroup>
144145
<ItemGroup>
@@ -187,6 +188,7 @@
187188
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\associations.hpp" />
188189
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\duplicate.hpp" />
189190
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\ecdsa.hpp" />
191+
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\multisig.hpp" />
190192
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\prevout.hpp" />
191193
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\schnorr.hpp" />
192194
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_bk.hpp" />
@@ -207,6 +209,7 @@
207209
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\fee_rate.hpp" />
208210
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\header_state.hpp" />
209211
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\history.hpp" />
212+
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\multisig_view.hpp" />
210213
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\position.hpp" />
211214
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\span.hpp" />
212215
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\type.hpp" />

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@
132132
<ClCompile Include="..\..\..\..\src\types\history.cpp">
133133
<Filter>src\types</Filter>
134134
</ClCompile>
135+
<ClCompile Include="..\..\..\..\src\types\multisig_view.cpp">
136+
<Filter>src\types</Filter>
137+
</ClCompile>
135138
<ClCompile Include="..\..\..\..\src\types\unspent.cpp">
136139
<Filter>src\types</Filter>
137140
</ClCompile>
@@ -272,6 +275,9 @@
272275
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\ecdsa.hpp">
273276
<Filter>include\bitcoin\database\tables\caches</Filter>
274277
</ClInclude>
278+
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\multisig.hpp">
279+
<Filter>include\bitcoin\database\tables\caches</Filter>
280+
</ClInclude>
275281
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\prevout.hpp">
276282
<Filter>include\bitcoin\database\tables\caches</Filter>
277283
</ClInclude>
@@ -332,6 +338,9 @@
332338
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\history.hpp">
333339
<Filter>include\bitcoin\database\types</Filter>
334340
</ClInclude>
341+
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\multisig_view.hpp">
342+
<Filter>include\bitcoin\database\types</Filter>
343+
</ClInclude>
335344
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\position.hpp">
336345
<Filter>include\bitcoin\database\types</Filter>
337346
</ClInclude>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@
198198
<ClCompile Include="..\..\..\..\test\tables\archives\txs.cpp" />
199199
<ClCompile Include="..\..\..\..\test\tables\caches\duplicate.cpp" />
200200
<ClCompile Include="..\..\..\..\test\tables\caches\ecdsa.cpp" />
201+
<ClCompile Include="..\..\..\..\test\tables\caches\multisig.cpp" />
201202
<ClCompile Include="..\..\..\..\test\tables\caches\prevout.cpp" />
202203
<ClCompile Include="..\..\..\..\test\tables\caches\schnorr.cpp" />
203204
<ClCompile Include="..\..\..\..\test\tables\caches\validated_bk.cpp" />

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@
270270
<ClCompile Include="..\..\..\..\test\tables\caches\ecdsa.cpp">
271271
<Filter>src\tables\caches</Filter>
272272
</ClCompile>
273+
<ClCompile Include="..\..\..\..\test\tables\caches\multisig.cpp">
274+
<Filter>src\tables\caches</Filter>
275+
</ClCompile>
273276
<ClCompile Include="..\..\..\..\test\tables\caches\prevout.cpp">
274277
<Filter>src\tables\caches</Filter>
275278
</ClCompile>

‎builds/msvc/vs2026/libbitcoin-database-test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<package id="libbitcoin-boost_locale-vc145" version="1.91.0" targetFramework="Native" />
1414
<package id="libbitcoin-boost_program_options-vc145" version="1.91.0" targetFramework="Native" />
1515
<package id="libbitcoin-boost_thread-vc145" version="1.91.0" targetFramework="Native" />
16+
<package id="libbitcoin-boost_unit_test_framework-vc145" version="1.91.0" targetFramework="Native" />
1617
<package id="libbitcoin-boost_url-vc145" version="1.91.0" targetFramework="Native" />
1718
<package id="secp256k1_vc145" version="0.6.1" targetFramework="Native" />
18-
<package id="libbitcoin-boost_unit_test_framework-vc145" version="1.91.0" targetFramework="Native" />
1919
</packages>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
</ClCompile>
140140
<ClCompile Include="..\..\..\..\src\settings.cpp" />
141141
<ClCompile Include="..\..\..\..\src\types\history.cpp" />
142+
<ClCompile Include="..\..\..\..\src\types\multisig_view.cpp" />
142143
<ClCompile Include="..\..\..\..\src\types\unspent.cpp" />
143144
</ItemGroup>
144145
<ItemGroup>
@@ -187,6 +188,7 @@
187188
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\associations.hpp" />
188189
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\duplicate.hpp" />
189190
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\ecdsa.hpp" />
191+
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\multisig.hpp" />
190192
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\prevout.hpp" />
191193
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\schnorr.hpp" />
192194
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_bk.hpp" />
@@ -207,6 +209,7 @@
207209
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\fee_rate.hpp" />
208210
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\header_state.hpp" />
209211
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\history.hpp" />
212+
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\multisig_view.hpp" />
210213
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\position.hpp" />
211214
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\span.hpp" />
212215
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\type.hpp" />

0 commit comments

Comments
 (0)