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

Jump to bottom

Update Core to protocol 22. #4464

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Update Core to protocol 22. #4464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45f8293
Update Core to protocol 22.
dmkozh Sep 11, 2024
43dd603
Regenerate LCM/txmeta
dmkozh Sep 12, 2024
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
2 changes: 2 additions & 0 deletions Builds/VisualStudio/stellar-core.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,7 @@ exit /b 0
<ClCompile Include="..\..\src\ledger\LedgerHeaderUtils.cpp" />
<ClCompile Include="..\..\src\ledger\LedgerManagerImpl.cpp" />
<ClCompile Include="..\..\src\ledger\LedgerRange.cpp" />
<ClCompile Include="..\..\src\ledger\LedgerStateSnapshot.cpp" />
<ClCompile Include="..\..\src\ledger\LedgerTxn.cpp" />
<ClCompile Include="..\..\src\ledger\LedgerTxnAccountSQL.cpp" />
<ClCompile Include="..\..\src\ledger\LedgerTxnClaimableBalanceSQL.cpp" />
Expand Down Expand Up @@ -1041,6 +1042,7 @@ exit /b 0
<ClInclude Include="..\..\src\ledger\LedgerManager.h" />
<ClInclude Include="..\..\src\ledger\LedgerManagerImpl.h" />
<ClInclude Include="..\..\src\ledger\LedgerRange.h" />
<ClInclude Include="..\..\src\ledger\LedgerStateSnapshot.h" />
<ClInclude Include="..\..\src\ledger\LedgerTxn.h" />
<ClInclude Include="..\..\src\ledger\LedgerTxnEntry.h" />
<ClInclude Include="..\..\src\ledger\LedgerTxnHeader.h" />
Expand Down
6 changes: 6 additions & 0 deletions Builds/VisualStudio/stellar-core.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,6 +1377,9 @@
<ClCompile Include="..\..\src\main\QueryServer.cpp">
<Filter>main</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ledger\LedgerStateSnapshot.cpp">
<Filter>ledger</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\lib\util\cpptoml.h">
Expand Down Expand Up @@ -2402,6 +2405,9 @@
<ClInclude Include="..\..\src\main\QueryServer.h">
<Filter>main</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ledger\LedgerStateSnapshot.h">
<Filter>ledger</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\AUTHORS" />
Expand Down
2 changes: 1 addition & 1 deletion src/herder/test/HerderTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5556,7 +5556,7 @@ TEST_CASE("SCP message capture from previous ledger", "[herder]")
simulation->addConnection(validatorCKey.getPublicKey(),
validatorBKey.getPublicKey());
simulation->crankUntil(
[&]() { return C->getLedgerManager().getLastClosedLedgerNum() == 3; },
[&]() { return C->getLedgerManager().getLastClosedLedgerNum() >= 3; },
dmkozh marked this conversation as resolved.
Show resolved Hide resolved
4 * Herder::EXP_LEDGER_TIMESPAN_SECONDS, false);

// C should have 3 EXTERNALIZEs in its scphistory table for ledger 2. This
Expand Down
2 changes: 1 addition & 1 deletion src/main/Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

namespace stellar
{
const uint32 Config::CURRENT_LEDGER_PROTOCOL_VERSION = 21
const uint32 Config::CURRENT_LEDGER_PROTOCOL_VERSION = 22
#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
+ 1
#endif
Expand Down
2,061 changes: 2,061 additions & 0 deletions src/testdata/ledger-close-meta-v1-protocol-23-soroban.json
View file
Open in desktop

Large diffs are not rendered by default.

989 changes: 989 additions & 0 deletions src/testdata/ledger-close-meta-v1-protocol-23.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions src/transactions/test/InvokeHostFunctionTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4331,7 +4331,6 @@ TEST_CASE("Vm instantiation tightening", "[tx][soroban]")
}
}

#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
TEST_CASE("contract constructor support", "[tx][soroban]")
{
Config cfg = getTestConfig();
Expand Down Expand Up @@ -4432,4 +4431,3 @@ TEST_CASE("contract constructor support", "[tx][soroban]")
REQUIRE(invocation.getReturnValue().u32() == 303);
}
}
#endif
2 changes: 0 additions & 2 deletions src/transactions/test/TxEnvelopeTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2493,7 +2493,6 @@ TEST_CASE("soroban txs not allowed before protocol upgrade",
REQUIRE(tx->getResult().result.code() == txMALFORMED);
}

#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
TEST_CASE("XDR protocol compatibility validation", "[tx][envelope]")
{
auto validateTx = [](ProtocolVersion protocolVersion) {
Expand Down Expand Up @@ -2525,7 +2524,6 @@ TEST_CASE("XDR protocol compatibility validation", "[tx][envelope]")
REQUIRE(res->isSuccess());
}
}
#endif

TEST_CASE_VERSIONS("Soroban extension for non-Soroban tx",
"[tx][envelope][soroban]")
Expand Down
Loading
Loading