Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for the max number of dependent tx clusters per ledger setting #4609

Merged
merged 1 commit into from
Jan 15, 2025
+624 −63
Merged

Add support for the max number of dependent tx clusters per ledger setting #4609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@
[submodule "src/rust/soroban/p22"]
path = src/rust/soroban/p22
url = https://github.com/stellar/rs-soroban-env
[submodule "src/rust/soroban/p23"]
path = src/rust/soroban/p23
url = https://github.com/stellar/rs-soroban-env.git
5 changes: 3 additions & 2 deletions Builds/VisualStudio/build_rust.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ if "%version%"=="" (
)

%set_linker_flags% & cd %project_dir%\src\rust\soroban\p21 & (set RUSTFLAGS=-Cmetadata=p21) & cargo +%version% build %release_profile% --package soroban-env-host --locked --target-dir %out_dir%\soroban-p21-target
%set_linker_flags% & cd %project_dir%\src\rust\soroban\p22 & (set RUSTFLAGS=-Cmetadata=p22) & cargo +%version% build %release_profile% --package soroban-env-host %features% --locked --target-dir %out_dir%\soroban-p22-target
cd %project_dir% & cargo +%version% rustc %release_profile% --package stellar-core --locked --target-dir %out_dir%\target -- --extern soroban_env_host_p21=%out_dir%\soroban-p21-target\%2\libsoroban_env_host.rlib --extern soroban_env_host_p22=%out_dir%\soroban-p22-target\%2\libsoroban_env_host.rlib -L dependency=%out_dir%\soroban-p21-target\%2\deps -L dependency=%out_dir%\soroban-p22-target\%2\deps
%set_linker_flags% & cd %project_dir%\src\rust\soroban\p22 & (set RUSTFLAGS=-Cmetadata=p22) & cargo +%version% build %release_profile% --package soroban-env-host --locked --target-dir %out_dir%\soroban-p22-target
%set_linker_flags% & cd %project_dir%\src\rust\soroban\p23 & (set RUSTFLAGS=-Cmetadata=p23) & cargo +%version% build %release_profile% --package soroban-env-host --features next --locked --target-dir %out_dir%\soroban-p23-target
cd %project_dir% & cargo +%version% rustc %release_profile% --package stellar-core --locked %features% --target-dir %out_dir%\target -- --extern soroban_env_host_p21=%out_dir%\soroban-p21-target\%2\libsoroban_env_host.rlib --extern soroban_env_host_p22=%out_dir%\soroban-p22-target\%2\libsoroban_env_host.rlib --extern soroban_env_host_p23=%out_dir%\soroban-p23-target\%2\libsoroban_env_host.rlib -L dependency=%out_dir%\soroban-p21-target\%2\deps -L dependency=%out_dir%\soroban-p22-target\%2\deps -L dependency=%out_dir%\soroban-p23-target\%2\deps
8 changes: 3 additions & 5 deletions Builds/VisualStudio/stellar-core.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,6 @@ exit /b 0
<ClCompile Include="..\..\src\bucket\LiveBucket.cpp" />
<ClCompile Include="..\..\src\bucket\LiveBucketList.cpp" />
<ClCompile Include="..\..\src\bucket\MergeKey.cpp" />
<ClCompile Include="..\..\src\bucket\PublishQueueBuckets.cpp" />
<ClCompile Include="..\..\src\bucket\SearchableBucketList.cpp" />
<ClCompile Include="..\..\src\bucket\test\BucketIndexTests.cpp" />
<ClCompile Include="..\..\src\bucket\test\BucketListTests.cpp" />
Expand All @@ -487,11 +486,11 @@ exit /b 0
<ClCompile Include="..\..\src\catchup\ApplyLedgerWork.cpp" />
<ClCompile Include="..\..\src\catchup\AssumeStateWork.cpp" />
<ClCompile Include="..\..\src\catchup\CatchupConfiguration.cpp" />
<ClCompile Include="..\..\src\catchup\CatchupManagerImpl.cpp" />
<ClCompile Include="..\..\src\catchup\CatchupRange.cpp" />
<ClCompile Include="..\..\src\catchup\CatchupWork.cpp" />
<ClCompile Include="..\..\src\catchup\DownloadApplyTxsWork.cpp" />
<ClCompile Include="..\..\src\catchup\IndexBucketsWork.cpp" />
<ClCompile Include="..\..\src\catchup\LedgerApplyManagerImpl.cpp" />
<ClCompile Include="..\..\src\catchup\ReplayDebugMetaWork.cpp" />
<ClCompile Include="..\..\src\catchup\test\CatchupWorkTests.cpp" />
<ClCompile Include="..\..\src\catchup\VerifyLedgerChainWork.cpp" />
Expand Down Expand Up @@ -600,7 +599,6 @@ exit /b 0
<ClCompile Include="..\..\src\ledger\LedgerTxnEntry.cpp" />
<ClCompile Include="..\..\src\ledger\LedgerTxnHeader.cpp" />
<ClCompile Include="..\..\src\ledger\LedgerTxnOfferSQL.cpp" />

<ClCompile Include="..\..\src\ledger\LedgerTypeUtils.cpp" />
<ClCompile Include="..\..\src\ledger\NetworkConfig.cpp" />
<ClCompile Include="..\..\src\ledger\test\InMemoryLedgerTxn.cpp" />
Expand Down Expand Up @@ -932,7 +930,6 @@ exit /b 0
<ClInclude Include="..\..\src\bucket\LiveBucket.h" />
<ClInclude Include="..\..\src\bucket\LiveBucketList.h" />
<ClInclude Include="..\..\src\bucket\MergeKey.h" />
<ClInclude Include="..\..\src\bucket\PublishQueueBuckets.h" />
<ClInclude Include="..\..\src\bucket\SearchableBucketList.h" />
<ClInclude Include="..\..\src\bucket\test\BucketTestUtils.h" />
<ClInclude Include="..\..\src\catchup\ApplyBucketsWork.h" />
Expand All @@ -942,11 +939,12 @@ exit /b 0
<ClInclude Include="..\..\src\catchup\AssumeStateWork.h" />
<ClInclude Include="..\..\src\catchup\CatchupConfiguration.h" />
<ClInclude Include="..\..\src\catchup\CatchupManager.h" />
<ClInclude Include="..\..\src\catchup\CatchupManagerImpl.h" />
<ClInclude Include="..\..\src\catchup\CatchupRange.h" />
<ClInclude Include="..\..\src\catchup\CatchupWork.h" />
<ClInclude Include="..\..\src\catchup\DownloadApplyTxsWork.h" />
<ClInclude Include="..\..\src\catchup\IndexBucketsWork.h" />
<ClInclude Include="..\..\src\catchup\LedgerApplyManager.h" />
<ClInclude Include="..\..\src\catchup\LedgerApplyManagerImpl.h" />
<ClInclude Include="..\..\src\catchup\ReplayDebugMetaWork.h" />
<ClInclude Include="..\..\src\catchup\test\CatchupWorkTests.h" />
<ClInclude Include="..\..\src\catchup\VerifyLedgerChainWork.h" />
Expand Down
21 changes: 9 additions & 12 deletions Builds/VisualStudio/stellar-core.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,6 @@
<ClCompile Include="..\..\src\bucket\MergeKey.cpp">
<Filter>bucket</Filter>
</ClCompile>
<ClCompile Include="..\..\src\bucket\PublishQueueBuckets.cpp">
<Filter>bucket</Filter>
</ClCompile>
<ClCompile Include="..\..\src\catchup\test\CatchupWorkTests.cpp">
<Filter>catchup\tests</Filter>
</ClCompile>
Expand All @@ -618,9 +615,6 @@
<ClCompile Include="..\..\src\catchup\CatchupConfiguration.cpp">
<Filter>catchup</Filter>
</ClCompile>
<ClCompile Include="..\..\src\catchup\CatchupManagerImpl.cpp">
<Filter>catchup</Filter>
</ClCompile>
<ClCompile Include="..\..\src\catchup\CatchupRange.cpp">
<Filter>catchup</Filter>
</ClCompile>
Expand Down Expand Up @@ -1368,6 +1362,9 @@
<ClCompile Include="..\..\src\ledger\test\InMemoryLedgerTxnRoot.cpp">
<Filter>ledger\tests</Filter>
</ClCompile>
<ClCompile Include="..\..\src\catchup\LedgerApplyManagerImpl.cpp">
<Filter>catchup</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\lib\util\cpptoml.h">
Expand Down Expand Up @@ -1808,9 +1805,6 @@
<ClInclude Include="..\..\src\bucket\MergeKey.h">
<Filter>bucket</Filter>
</ClInclude>
<ClInclude Include="..\..\src\bucket\PublishQueueBuckets.h">
<Filter>bucket</Filter>
</ClInclude>
<ClInclude Include="..\..\src\catchup\test\CatchupWorkTests.h">
<Filter>catchup\tests</Filter>
</ClInclude>
Expand All @@ -1835,9 +1829,6 @@
<ClInclude Include="..\..\src\catchup\CatchupManager.h">
<Filter>catchup</Filter>
</ClInclude>
<ClInclude Include="..\..\src\catchup\CatchupManagerImpl.h">
<Filter>catchup</Filter>
</ClInclude>
<ClInclude Include="..\..\src\catchup\CatchupRange.h">
<Filter>catchup</Filter>
</ClInclude>
Expand Down Expand Up @@ -2413,6 +2404,12 @@
<ClInclude Include="..\..\src\ledger\test\InMemoryLedgerTxnRoot.h">
<Filter>ledger\tests</Filter>
</ClInclude>
<ClInclude Include="..\..\src\catchup\LedgerApplyManager.h">
<Filter>catchup</Filter>
</ClInclude>
<ClInclude Include="..\..\src\catchup\LedgerApplyManagerImpl.h">
<Filter>catchup</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\AUTHORS" />
Expand Down
4 changes: 4 additions & 0 deletions src/herder/Upgrades.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,10 @@ Upgrades::applyVersionUpgrade(Application& app, AbstractLedgerTxn& ltx,
{
SorobanNetworkConfig::createCostTypesForV22(ltx, app);
}
if (needUpgradeToVersion(ProtocolVersion::V_23, prevVersion, newVersion))
{
SorobanNetworkConfig::createLedgerEntriesForV23(ltx, app);
}
}

void
Expand Down
Loading
Loading