Update Core to protocol 22.

stellar · Sep 12, 2024 · eb72b03 · eb72b03
1 parent fbb53d8
commit eb72b03
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/Builds/VisualStudio/stellar-core.vcxproj b/Builds/VisualStudio/stellar-core.vcxproj
@@ -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" />
@@ -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" />

diff --git a/Builds/VisualStudio/stellar-core.vcxproj.filters b/Builds/VisualStudio/stellar-core.vcxproj.filters
@@ -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">
@@ -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" />

diff --git a/src/herder/test/HerderTests.cpp b/src/herder/test/HerderTests.cpp
@@ -5548,7 +5548,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; },
         4 * Herder::EXP_LEDGER_TIMESPAN_SECONDS, false);
 
     // C should have 3 EXTERNALIZEs in its scphistory table for ledger 2. This

diff --git a/src/main/Config.cpp b/src/main/Config.cpp
@@ -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

diff --git a/src/transactions/test/InvokeHostFunctionTests.cpp b/src/transactions/test/InvokeHostFunctionTests.cpp
@@ -4327,7 +4327,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();
@@ -4428,4 +4427,3 @@ TEST_CASE("contract constructor support", "[tx][soroban]")
         REQUIRE(invocation.getReturnValue().u32() == 303);
     }
 }
-#endif
diff --git a/src/transactions/test/TxEnvelopeTests.cpp b/src/transactions/test/TxEnvelopeTests.cpp
@@ -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) {
@@ -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]")