Skip to content

Commit 80f8066

Browse files
sisureshsisuresh
authored
Merge branch 'master' into testnetslp
2 parents baa6504 + d14e7b6 commit 80f8066

File tree

151 files changed

+3223
-10048
lines changed

Some content is hidden

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

151 files changed

+3223
-10048
lines changed

‎.github/workflows/build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ jobs:
1515
complete:
1616
if: always()
1717
needs: [fmt, cargo-deny, rust-check-git-rev-deps, build]
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-22.04
1919
steps:
2020
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
2121
run: exit 1
2222

2323
fmt:
24-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-22.04
2525
steps:
2626
- uses: actions/checkout@v3
2727
- run: rustup component add rustfmt
2828
- run: rustup update
2929
- run: cargo fmt --all --check
3030

3131
cargo-deny:
32-
runs-on: ubuntu-latest
32+
runs-on: ubuntu-22.04
3333
strategy:
3434
matrix:
3535
checks:
@@ -47,13 +47,13 @@ jobs:
4747
arguments:
4848

4949
rust-check-git-rev-deps:
50-
runs-on: ubuntu-latest
50+
runs-on: ubuntu-22.04
5151
steps:
5252
- uses: actions/checkout@v3
5353
- uses: stellar/actions/rust-check-git-rev-deps@main
5454

5555
build:
56-
runs-on: ubuntu-latest
56+
runs-on: ubuntu-22.04
5757
env:
5858
CACHED_PATHS: |
5959
~/.ccache

‎Builds/VisualStudio/stellar-core.vcxproj

+23-12
Original file line numberDiff line numberDiff line change
@@ -481,20 +481,26 @@ exit /b 0
481481
<ClCompile Include="..\..\lib\spdlog.cpp" />
482482
<ClCompile Include="..\..\lib\tracy\public\TracyClient.cpp" />
483483
<ClCompile Include="..\..\lib\util\siphash.cpp" />
484-
<ClCompile Include="..\..\src\bucket\Bucket.cpp" />
485484
<ClCompile Include="..\..\src\bucket\BucketApplicator.cpp" />
485+
<ClCompile Include="..\..\src\bucket\BucketBase.cpp" />
486486
<ClCompile Include="..\..\src\bucket\BucketIndexImpl.cpp" />
487487
<ClCompile Include="..\..\src\bucket\BucketInputIterator.cpp" />
488-
<ClCompile Include="..\..\src\bucket\BucketList.cpp" />
489-
<ClCompile Include="..\..\src\bucket\BucketListSnapshot.cpp" />
490-
<ClCompile Include="..\..\src\bucket\BucketManagerImpl.cpp" />
488+
<ClCompile Include="..\..\src\bucket\BucketListBase.cpp" />
489+
<ClCompile Include="..\..\src\bucket\BucketListSnapshotBase.cpp" />
490+
<ClCompile Include="..\..\src\bucket\BucketManager.cpp" />
491491
<ClCompile Include="..\..\src\bucket\BucketMergeMap.cpp" />
492492
<ClCompile Include="..\..\src\bucket\BucketOutputIterator.cpp" />
493493
<ClCompile Include="..\..\src\bucket\BucketSnapshot.cpp" />
494494
<ClCompile Include="..\..\src\bucket\BucketSnapshotManager.cpp" />
495+
<ClCompile Include="..\..\src\bucket\BucketUtils.cpp" />
495496
<ClCompile Include="..\..\src\bucket\FutureBucket.cpp" />
497+
<ClCompile Include="..\..\src\bucket\HotArchiveBucket.cpp" />
498+
<ClCompile Include="..\..\src\bucket\HotArchiveBucketList.cpp" />
499+
<ClCompile Include="..\..\src\bucket\LiveBucket.cpp" />
500+
<ClCompile Include="..\..\src\bucket\LiveBucketList.cpp" />
496501
<ClCompile Include="..\..\src\bucket\MergeKey.cpp" />
497502
<ClCompile Include="..\..\src\bucket\PublishQueueBuckets.cpp" />
503+
<ClCompile Include="..\..\src\bucket\SearchableBucketList.cpp" />
498504
<ClCompile Include="..\..\src\bucket\test\BucketIndexTests.cpp" />
499505
<ClCompile Include="..\..\src\bucket\test\BucketListTests.cpp" />
500506
<ClCompile Include="..\..\src\bucket\test\BucketManagerTests.cpp" />
@@ -610,8 +616,6 @@ exit /b 0
610616
<ClCompile Include="..\..\src\invariant\test\SponsorshipCountIsValidTests.cpp" />
611617
<ClCompile Include="..\..\src\ledger\CheckpointRange.cpp" />
612618
<ClCompile Include="..\..\src\ledger\FlushAndRotateMetaDebugWork.cpp" />
613-
<ClCompile Include="..\..\src\ledger\InMemoryLedgerTxn.cpp" />
614-
<ClCompile Include="..\..\src\ledger\InMemoryLedgerTxnRoot.cpp" />
615619
<ClCompile Include="..\..\src\ledger\InternalLedgerEntry.cpp" />
616620
<ClCompile Include="..\..\src\ledger\LedgerCloseMetaFrame.cpp" />
617621
<ClCompile Include="..\..\src\ledger\LedgerHeaderUtils.cpp" />
@@ -633,6 +637,8 @@ exit /b 0
633637
<ClCompile Include="..\..\src\ledger\LedgerTxnTrustLineSQL.cpp" />
634638
<ClCompile Include="..\..\src\ledger\LedgerTypeUtils.cpp" />
635639
<ClCompile Include="..\..\src\ledger\NetworkConfig.cpp" />
640+
<ClCompile Include="..\..\src\ledger\test\InMemoryLedgerTxn.cpp" />
641+
<ClCompile Include="..\..\src\ledger\test\InMemoryLedgerTxnRoot.cpp" />
636642
<ClCompile Include="..\..\src\ledger\test\LedgerCloseMetaStreamTests.cpp" />
637643
<ClCompile Include="..\..\src\ledger\test\LedgerHeaderTests.cpp" />
638644
<ClCompile Include="..\..\src\ledger\test\LedgerTests.cpp" />
@@ -942,23 +948,28 @@ exit /b 0
942948
<ClInclude Include="..\..\lib\fmt\include\fmt\format.h" />
943949
<ClInclude Include="..\..\lib\util\siphash.h" />
944950
<ClInclude Include="..\..\lib\util\stdrandom.h" />
945-
<ClInclude Include="..\..\src\bucket\Bucket.h" />
946951
<ClInclude Include="..\..\src\bucket\BucketApplicator.h" />
952+
<ClInclude Include="..\..\src\bucket\BucketBase.h" />
947953
<ClInclude Include="..\..\src\bucket\BucketIndex.h" />
948954
<ClInclude Include="..\..\src\bucket\BucketIndexImpl.h" />
949955
<ClInclude Include="..\..\src\bucket\BucketInputIterator.h" />
950-
<ClInclude Include="..\..\src\bucket\BucketList.h" />
951-
<ClInclude Include="..\..\src\bucket\BucketListSnapshot.h" />
956+
<ClInclude Include="..\..\src\bucket\BucketListBase.h" />
957+
<ClInclude Include="..\..\src\bucket\BucketListSnapshotBase.h" />
952958
<ClInclude Include="..\..\src\bucket\BucketManager.h" />
953-
<ClInclude Include="..\..\src\bucket\BucketManagerImpl.h" />
954959
<ClInclude Include="..\..\src\bucket\BucketMergeMap.h" />
955960
<ClInclude Include="..\..\src\bucket\BucketOutputIterator.h" />
956961
<ClInclude Include="..\..\src\bucket\BucketSnapshot.h" />
957962
<ClInclude Include="..\..\src\bucket\BucketSnapshotManager.h" />
963+
<ClInclude Include="..\..\src\bucket\BucketUtils.h" />
958964
<ClInclude Include="..\..\src\bucket\FutureBucket.h" />
965+
<ClInclude Include="..\..\src\bucket\HotArchiveBucket.h" />
966+
<ClInclude Include="..\..\src\bucket\HotArchiveBucketList.h" />
959967
<ClInclude Include="..\..\src\bucket\LedgerCmp.h" />
968+
<ClInclude Include="..\..\src\bucket\LiveBucket.h" />
969+
<ClInclude Include="..\..\src\bucket\LiveBucketList.h" />
960970
<ClInclude Include="..\..\src\bucket\MergeKey.h" />
961971
<ClInclude Include="..\..\src\bucket\PublishQueueBuckets.h" />
972+
<ClInclude Include="..\..\src\bucket\SearchableBucketList.h" />
962973
<ClInclude Include="..\..\src\bucket\test\BucketTestUtils.h" />
963974
<ClInclude Include="..\..\src\catchup\ApplyBucketsWork.h" />
964975
<ClInclude Include="..\..\src\catchup\ApplyBufferedLedgersWork.h" />
@@ -1057,8 +1068,6 @@ exit /b 0
10571068
<ClInclude Include="..\..\src\invariant\test\InvariantTestUtils.h" />
10581069
<ClInclude Include="..\..\src\ledger\CheckpointRange.h" />
10591070
<ClInclude Include="..\..\src\ledger\FlushAndRotateMetaDebugWork.h" />
1060-
<ClInclude Include="..\..\src\ledger\InMemoryLedgerTxn.h" />
1061-
<ClInclude Include="..\..\src\ledger\InMemoryLedgerTxnRoot.h" />
10621071
<ClInclude Include="..\..\src\ledger\InternalLedgerEntry.h" />
10631072
<ClInclude Include="..\..\src\ledger\LedgerCloseMetaFrame.h" />
10641073
<ClInclude Include="..\..\src\ledger\LedgerHashUtils.h" />
@@ -1074,6 +1083,8 @@ exit /b 0
10741083
<ClInclude Include="..\..\src\ledger\LedgerTypeUtils.h" />
10751084
<ClInclude Include="..\..\src\ledger\NetworkConfig.h" />
10761085
<ClInclude Include="..\..\src\ledger\NonSociRelatedException.h" />
1086+
<ClInclude Include="..\..\src\ledger\test\InMemoryLedgerTxn.h" />
1087+
<ClInclude Include="..\..\src\ledger\test\InMemoryLedgerTxnRoot.h" />
10771088
<ClInclude Include="..\..\src\ledger\test\LedgerTestUtils.h" />
10781089
<ClInclude Include="..\..\src\ledger\SorobanMetrics.h" />
10791090
<ClInclude Include="..\..\src\ledger\TrustLineWrapper.h" />

‎Builds/VisualStudio/stellar-core.vcxproj.filters

+69-36
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@
576576
<ClCompile Include="..\..\src\bucket\test\BucketTestUtils.cpp">
577577
<Filter>bucket\tests</Filter>
578578
</ClCompile>
579-
<ClCompile Include="..\..\src\bucket\Bucket.cpp">
580-
<Filter>bucket</Filter>
581-
</ClCompile>
582579
<ClCompile Include="..\..\src\bucket\BucketApplicator.cpp">
583580
<Filter>bucket</Filter>
584581
</ClCompile>
@@ -588,12 +585,6 @@
588585
<ClCompile Include="..\..\src\bucket\BucketInputIterator.cpp">
589586
<Filter>bucket</Filter>
590587
</ClCompile>
591-
<ClCompile Include="..\..\src\bucket\BucketList.cpp">
592-
<Filter>bucket</Filter>
593-
</ClCompile>
594-
<ClCompile Include="..\..\src\bucket\BucketManagerImpl.cpp">
595-
<Filter>bucket</Filter>
596-
</ClCompile>
597588
<ClCompile Include="..\..\src\bucket\BucketMergeMap.cpp">
598589
<Filter>bucket</Filter>
599590
</ClCompile>
@@ -909,12 +900,6 @@
909900
<ClCompile Include="..\..\src\ledger\FlushAndRotateMetaDebugWork.cpp">
910901
<Filter>ledger</Filter>
911902
</ClCompile>
912-
<ClCompile Include="..\..\src\ledger\InMemoryLedgerTxn.cpp">
913-
<Filter>ledger</Filter>
914-
</ClCompile>
915-
<ClCompile Include="..\..\src\ledger\InMemoryLedgerTxnRoot.cpp">
916-
<Filter>ledger</Filter>
917-
</ClCompile>
918903
<ClCompile Include="..\..\src\ledger\InternalLedgerEntry.cpp">
919904
<Filter>ledger</Filter>
920905
</ClCompile>
@@ -1323,9 +1308,6 @@
13231308
<ClCompile Include="..\..\src\main\SettingsUpgradeUtils.cpp">
13241309
<Filter>main</Filter>
13251310
</ClCompile>
1326-
<ClCompile Include="..\..\src\bucket\BucketListSnapshot.cpp">
1327-
<Filter>bucket</Filter>
1328-
</ClCompile>
13291311
<ClCompile Include="..\..\src\bucket\BucketSnapshot.cpp">
13301312
<Filter>bucket</Filter>
13311313
</ClCompile>
@@ -1383,6 +1365,42 @@
13831365
<ClCompile Include="..\..\src\history\CheckpointBuilder.cpp">
13841366
<Filter>history</Filter>
13851367
</ClCompile>
1368+
<ClCompile Include="..\..\src\bucket\BucketBase.cpp">
1369+
<Filter>bucket</Filter>
1370+
</ClCompile>
1371+
<ClCompile Include="..\..\src\bucket\BucketListBase.cpp">
1372+
<Filter>bucket</Filter>
1373+
</ClCompile>
1374+
<ClCompile Include="..\..\src\bucket\BucketListSnapshotBase.cpp">
1375+
<Filter>bucket</Filter>
1376+
</ClCompile>
1377+
<ClCompile Include="..\..\src\bucket\HotArchiveBucket.cpp">
1378+
<Filter>bucket</Filter>
1379+
</ClCompile>
1380+
<ClCompile Include="..\..\src\bucket\HotArchiveBucketList.cpp">
1381+
<Filter>bucket</Filter>
1382+
</ClCompile>
1383+
<ClCompile Include="..\..\src\bucket\LiveBucket.cpp">
1384+
<Filter>bucket</Filter>
1385+
</ClCompile>
1386+
<ClCompile Include="..\..\src\bucket\LiveBucketList.cpp">
1387+
<Filter>bucket</Filter>
1388+
</ClCompile>
1389+
<ClCompile Include="..\..\src\bucket\SearchableBucketList.cpp">
1390+
<Filter>bucket</Filter>
1391+
</ClCompile>
1392+
<ClCompile Include="..\..\src\bucket\BucketManager.cpp">
1393+
<Filter>bucket</Filter>
1394+
</ClCompile>
1395+
<ClCompile Include="..\..\src\bucket\BucketUtils.cpp">
1396+
<Filter>bucket</Filter>
1397+
</ClCompile>
1398+
<ClCompile Include="..\..\src\ledger\test\InMemoryLedgerTxn.cpp">
1399+
<Filter>ledger\tests</Filter>
1400+
</ClCompile>
1401+
<ClCompile Include="..\..\src\ledger\test\InMemoryLedgerTxnRoot.cpp">
1402+
<Filter>ledger\tests</Filter>
1403+
</ClCompile>
13861404
</ItemGroup>
13871405
<ItemGroup>
13881406
<ClInclude Include="..\..\lib\util\cpptoml.h">
@@ -1796,9 +1814,6 @@
17961814
<ClInclude Include="..\..\src\bucket\test\BucketTestUtils.h">
17971815
<Filter>bucket\tests</Filter>
17981816
</ClInclude>
1799-
<ClInclude Include="..\..\src\bucket\Bucket.h">
1800-
<Filter>bucket</Filter>
1801-
</ClInclude>
18021817
<ClInclude Include="..\..\src\bucket\BucketApplicator.h">
18031818
<Filter>bucket</Filter>
18041819
</ClInclude>
@@ -1811,15 +1826,9 @@
18111826
<ClInclude Include="..\..\src\bucket\BucketInputIterator.h">
18121827
<Filter>bucket</Filter>
18131828
</ClInclude>
1814-
<ClInclude Include="..\..\src\bucket\BucketList.h">
1815-
<Filter>bucket</Filter>
1816-
</ClInclude>
18171829
<ClInclude Include="..\..\src\bucket\BucketManager.h">
18181830
<Filter>bucket</Filter>
18191831
</ClInclude>
1820-
<ClInclude Include="..\..\src\bucket\BucketManagerImpl.h">
1821-
<Filter>bucket</Filter>
1822-
</ClInclude>
18231832
<ClInclude Include="..\..\src\bucket\BucketMergeMap.h">
18241833
<Filter>bucket</Filter>
18251834
</ClInclude>
@@ -2087,12 +2096,6 @@
20872096
<ClInclude Include="..\..\src\ledger\FlushAndRotateMetaDebugWork.h">
20882097
<Filter>ledger</Filter>
20892098
</ClInclude>
2090-
<ClInclude Include="..\..\src\ledger\InMemoryLedgerTxn.h">
2091-
<Filter>ledger</Filter>
2092-
</ClInclude>
2093-
<ClInclude Include="..\..\src\ledger\InMemoryLedgerTxnRoot.h">
2094-
<Filter>ledger</Filter>
2095-
</ClInclude>
20962099
<ClInclude Include="..\..\src\ledger\InternalLedgerEntry.h">
20972100
<Filter>ledger</Filter>
20982101
</ClInclude>
@@ -2357,9 +2360,6 @@
23572360
<ClInclude Include="..\..\src\main\SettingsUpgradeUtils.h">
23582361
<Filter>main</Filter>
23592362
</ClInclude>
2360-
<ClInclude Include="..\..\src\bucket\BucketListSnapshot.h">
2361-
<Filter>bucket</Filter>
2362-
</ClInclude>
23632363
<ClInclude Include="..\..\src\bucket\BucketSnapshot.h">
23642364
<Filter>bucket</Filter>
23652365
</ClInclude>
@@ -2416,6 +2416,39 @@
24162416
<ClInclude Include="..\..\src\history\CheckpointBuilder.h">
24172417
<Filter>history</Filter>
24182418
</ClInclude>
2419+
<ClInclude Include="..\..\src\bucket\BucketBase.h">
2420+
<Filter>bucket</Filter>
2421+
</ClInclude>
2422+
<ClInclude Include="..\..\src\bucket\BucketListBase.h">
2423+
<Filter>bucket</Filter>
2424+
</ClInclude>
2425+
<ClInclude Include="..\..\src\bucket\BucketListSnapshotBase.h">
2426+
<Filter>bucket</Filter>
2427+
</ClInclude>
2428+
<ClInclude Include="..\..\src\bucket\HotArchiveBucket.h">
2429+
<Filter>bucket</Filter>
2430+
</ClInclude>
2431+
<ClInclude Include="..\..\src\bucket\HotArchiveBucketList.h">
2432+
<Filter>bucket</Filter>
2433+
</ClInclude>
2434+
<ClInclude Include="..\..\src\bucket\LiveBucket.h">
2435+
<Filter>bucket</Filter>
2436+
</ClInclude>
2437+
<ClInclude Include="..\..\src\bucket\LiveBucketList.h">
2438+
<Filter>bucket</Filter>
2439+
</ClInclude>
2440+
<ClInclude Include="..\..\src\bucket\SearchableBucketList.h">
2441+
<Filter>bucket</Filter>
2442+
</ClInclude>
2443+
<ClInclude Include="..\..\src\bucket\BucketUtils.h">
2444+
<Filter>bucket</Filter>
2445+
</ClInclude>
2446+
<ClInclude Include="..\..\src\ledger\test\InMemoryLedgerTxn.h">
2447+
<Filter>ledger\tests</Filter>
2448+
</ClInclude>
2449+
<ClInclude Include="..\..\src\ledger\test\InMemoryLedgerTxnRoot.h">
2450+
<Filter>ledger\tests</Filter>
2451+
</ClInclude>
24192452
</ItemGroup>
24202453
<ItemGroup>
24212454
<None Include="..\..\AUTHORS" />

‎Cargo.lock

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/integration.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ stellar-core generates several types of data that can be used by applications, d
1717

1818
## Ledger State
1919

20-
Full [Ledger](ledger.md) snapshots are available in both:
20+
Full [Ledger](ledger.md) snapshots are available via both:
2121
* [history archives](history.md) (checkpoints, every 64 ledgers, updated every 5 minutes)
22-
* in the case of captive-core (enabled via the `--in-memory` command line option) the ledger is maintained within the stellar-core process and ledger-state need to be tracked as it changes via "meta" updates.
22+
* a stellar-core instance, where the ledger is maintained within the stellar-core process and ledger-state need to be tracked as it changes via "meta" updates.
2323

2424
## Ledger State transition information (transactions, etc)
2525

0 commit comments

Comments
 (0)