Skip to content

Commit 41fc73a

Browse files
dmkozhdmkozh
committed
Adapt Core to the CAP-67 XDR.
This is unfortunately rather hacky in order to allow for these changes to go in a minor release. Specifically, we're only bumping XDR for the Core itself, and not for the Rust env. That's why we need to temporarily disable a few XDR integrity checks. There is also a point of interaction of the new and old XDR(ScAddress changes), and I've added some tests to ensure that Core won't be able to accidentally accept XDR that's not supported by the current protocol.
1 parent df3edf9 commit 41fc73a

File tree

9 files changed

+136
-19
lines changed

9 files changed

+136
-19
lines changed

‎Builds/VisualStudio/stellar-core.vcxproj

+12-3
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ exit /b 0
457457
<ClCompile Include="..\..\lib\util\siphash.cpp" />
458458
<ClCompile Include="..\..\src\bucket\BucketApplicator.cpp" />
459459
<ClCompile Include="..\..\src\bucket\BucketBase.cpp" />
460-
<ClCompile Include="..\..\src\bucket\BucketIndexImpl.cpp" />
460+
<ClCompile Include="..\..\src\bucket\BucketIndexUtils.cpp" />
461461
<ClCompile Include="..\..\src\bucket\BucketInputIterator.cpp" />
462462
<ClCompile Include="..\..\src\bucket\BucketListBase.cpp" />
463463
<ClCompile Include="..\..\src\bucket\BucketListSnapshotBase.cpp" />
@@ -467,10 +467,14 @@ exit /b 0
467467
<ClCompile Include="..\..\src\bucket\BucketSnapshot.cpp" />
468468
<ClCompile Include="..\..\src\bucket\BucketSnapshotManager.cpp" />
469469
<ClCompile Include="..\..\src\bucket\BucketUtils.cpp" />
470+
<ClCompile Include="..\..\src\bucket\DiskIndex.cpp" />
470471
<ClCompile Include="..\..\src\bucket\FutureBucket.cpp" />
471472
<ClCompile Include="..\..\src\bucket\HotArchiveBucket.cpp" />
473+
<ClCompile Include="..\..\src\bucket\HotArchiveBucketIndex.cpp" />
472474
<ClCompile Include="..\..\src\bucket\HotArchiveBucketList.cpp" />
475+
<ClCompile Include="..\..\src\bucket\InMemoryIndex.cpp" />
473476
<ClCompile Include="..\..\src\bucket\LiveBucket.cpp" />
477+
<ClCompile Include="..\..\src\bucket\LiveBucketIndex.cpp" />
474478
<ClCompile Include="..\..\src\bucket\LiveBucketList.cpp" />
475479
<ClCompile Include="..\..\src\bucket\MergeKey.cpp" />
476480
<ClCompile Include="..\..\src\bucket\SearchableBucketList.cpp" />
@@ -565,6 +569,7 @@ exit /b 0
565569
<ClCompile Include="..\..\src\history\HistoryArchiveManager.cpp" />
566570
<ClCompile Include="..\..\src\history\HistoryArchiveReportWork.cpp" />
567571
<ClCompile Include="..\..\src\history\HistoryManagerImpl.cpp" />
572+
<ClCompile Include="..\..\src\history\HistoryUtils.cpp" />
568573
<ClCompile Include="..\..\src\history\StateSnapshot.cpp" />
569574
<ClCompile Include="..\..\src\history\test\HistoryTests.cpp" />
570575
<ClCompile Include="..\..\src\history\test\HistoryTestsUtils.cpp" />
@@ -912,8 +917,7 @@ exit /b 0
912917
<ClInclude Include="..\..\lib\util\stdrandom.h" />
913918
<ClInclude Include="..\..\src\bucket\BucketApplicator.h" />
914919
<ClInclude Include="..\..\src\bucket\BucketBase.h" />
915-
<ClInclude Include="..\..\src\bucket\BucketIndex.h" />
916-
<ClInclude Include="..\..\src\bucket\BucketIndexImpl.h" />
920+
<ClInclude Include="..\..\src\bucket\BucketIndexUtils.h" />
917921
<ClInclude Include="..\..\src\bucket\BucketInputIterator.h" />
918922
<ClInclude Include="..\..\src\bucket\BucketListBase.h" />
919923
<ClInclude Include="..\..\src\bucket\BucketListSnapshotBase.h" />
@@ -923,11 +927,15 @@ exit /b 0
923927
<ClInclude Include="..\..\src\bucket\BucketSnapshot.h" />
924928
<ClInclude Include="..\..\src\bucket\BucketSnapshotManager.h" />
925929
<ClInclude Include="..\..\src\bucket\BucketUtils.h" />
930+
<ClInclude Include="..\..\src\bucket\DiskIndex.h" />
926931
<ClInclude Include="..\..\src\bucket\FutureBucket.h" />
927932
<ClInclude Include="..\..\src\bucket\HotArchiveBucket.h" />
933+
<ClInclude Include="..\..\src\bucket\HotArchiveBucketIndex.h" />
928934
<ClInclude Include="..\..\src\bucket\HotArchiveBucketList.h" />
935+
<ClInclude Include="..\..\src\bucket\InMemoryIndex.h" />
929936
<ClInclude Include="..\..\src\bucket\LedgerCmp.h" />
930937
<ClInclude Include="..\..\src\bucket\LiveBucket.h" />
938+
<ClInclude Include="..\..\src\bucket\LiveBucketIndex.h" />
931939
<ClInclude Include="..\..\src\bucket\LiveBucketList.h" />
932940
<ClInclude Include="..\..\src\bucket\MergeKey.h" />
933941
<ClInclude Include="..\..\src\bucket\SearchableBucketList.h" />
@@ -1013,6 +1021,7 @@ exit /b 0
10131021
<ClInclude Include="..\..\src\history\HistoryArchiveReportWork.h" />
10141022
<ClInclude Include="..\..\src\history\HistoryManager.h" />
10151023
<ClInclude Include="..\..\src\history\HistoryManagerImpl.h" />
1024+
<ClInclude Include="..\..\src\history\HistoryUtils.h" />
10161025
<ClInclude Include="..\..\src\history\StateSnapshot.h" />
10171026
<ClInclude Include="..\..\src\history\test\HistoryTestsUtils.h" />
10181027
<ClInclude Include="..\..\src\invariant\AccountSubEntriesCountIsValid.h" />

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

+36-9
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,6 @@
576576
<ClCompile Include="..\..\src\bucket\BucketApplicator.cpp">
577577
<Filter>bucket</Filter>
578578
</ClCompile>
579-
<ClCompile Include="..\..\src\bucket\BucketIndexImpl.cpp">
580-
<Filter>bucket</Filter>
581-
</ClCompile>
582579
<ClCompile Include="..\..\src\bucket\BucketInputIterator.cpp">
583580
<Filter>bucket</Filter>
584581
</ClCompile>
@@ -1365,6 +1362,24 @@
13651362
<ClCompile Include="..\..\src\catchup\LedgerApplyManagerImpl.cpp">
13661363
<Filter>catchup</Filter>
13671364
</ClCompile>
1365+
<ClCompile Include="..\..\src\bucket\HotArchiveBucketIndex.cpp">
1366+
<Filter>bucket</Filter>
1367+
</ClCompile>
1368+
<ClCompile Include="..\..\src\bucket\LiveBucketIndex.cpp">
1369+
<Filter>bucket</Filter>
1370+
</ClCompile>
1371+
<ClCompile Include="..\..\src\bucket\DiskIndex.cpp">
1372+
<Filter>bucket</Filter>
1373+
</ClCompile>
1374+
<ClCompile Include="..\..\src\bucket\BucketIndexUtils.cpp">
1375+
<Filter>bucket</Filter>
1376+
</ClCompile>
1377+
<ClCompile Include="..\..\src\bucket\InMemoryIndex.cpp">
1378+
<Filter>bucket</Filter>
1379+
</ClCompile>
1380+
<ClCompile Include="..\..\src\history\HistoryUtils.cpp">
1381+
<Filter>history</Filter>
1382+
</ClCompile>
13681383
</ItemGroup>
13691384
<ItemGroup>
13701385
<ClInclude Include="..\..\lib\util\cpptoml.h">
@@ -1778,12 +1793,6 @@
17781793
<ClInclude Include="..\..\src\bucket\BucketApplicator.h">
17791794
<Filter>bucket</Filter>
17801795
</ClInclude>
1781-
<ClInclude Include="..\..\src\bucket\BucketIndex.h">
1782-
<Filter>bucket</Filter>
1783-
</ClInclude>
1784-
<ClInclude Include="..\..\src\bucket\BucketIndexImpl.h">
1785-
<Filter>bucket</Filter>
1786-
</ClInclude>
17871796
<ClInclude Include="..\..\src\bucket\BucketInputIterator.h">
17881797
<Filter>bucket</Filter>
17891798
</ClInclude>
@@ -2410,6 +2419,24 @@
24102419
<ClInclude Include="..\..\src\catchup\LedgerApplyManagerImpl.h">
24112420
<Filter>catchup</Filter>
24122421
</ClInclude>
2422+
<ClInclude Include="..\..\src\bucket\HotArchiveBucketIndex.h">
2423+
<Filter>bucket</Filter>
2424+
</ClInclude>
2425+
<ClInclude Include="..\..\src\bucket\LiveBucketIndex.h">
2426+
<Filter>bucket</Filter>
2427+
</ClInclude>
2428+
<ClInclude Include="..\..\src\bucket\DiskIndex.h">
2429+
<Filter>bucket</Filter>
2430+
</ClInclude>
2431+
<ClInclude Include="..\..\src\bucket\BucketIndexUtils.h">
2432+
<Filter>bucket</Filter>
2433+
</ClInclude>
2434+
<ClInclude Include="..\..\src\bucket\InMemoryIndex.h">
2435+
<Filter>bucket</Filter>
2436+
</ClInclude>
2437+
<ClInclude Include="..\..\src\history\HistoryUtils.h">
2438+
<Filter>history</Filter>
2439+
</ClInclude>
24132440
</ItemGroup>
24142441
<ItemGroup>
24152442
<None Include="..\..\AUTHORS" />

‎src/bucket/DiskIndex.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ DiskIndex<BucketT>::DiskIndex(BucketManager& bm,
133133
mData.assetToPoolID = std::make_unique<AssetPoolIDMap>();
134134
}
135135

136-
auto fileSize = fs::size(filename);
136+
auto fileSize = fs::size(filename.string());
137137
auto estimatedIndexEntries = fileSize / pageSize;
138138
mData.keysToOffset.reserve(estimatedIndexEntries);
139139

‎src/bucket/LiveBucketIndex.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ LiveBucketIndex::LiveBucketIndex(BucketManager& bm,
4848
ZoneScoped;
4949
releaseAssert(!filename.empty());
5050

51-
auto pageSize = getPageSize(bm.getConfig(), fs::size(filename));
51+
auto pageSize = getPageSize(bm.getConfig(), fs::size(filename.string()));
5252
if (pageSize == 0)
5353
{
5454

‎src/main/main.cpp

+13-1
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,18 @@ checkXDRFileIdentity()
186186
{
187187
continue;
188188
}
189+
// Temporarily (until we have cut the next minor release) disable the
190+
// check for the XDR changes necessary for the minor release. These
191+
// are mostly binary compatible with the Rust XDR, and the incompatible
192+
// part (ScAddress change) is actually supposed to be not decodable on
193+
// the Rust side.
194+
if (cpp.first.filename() == "Stellar-types.x" ||
195+
cpp.first.filename() == "Stellar-contract.x" ||
196+
cpp.first.filename() == "Stellar-ledger-entries.x" ||
197+
cpp.first.filename() == "Stellar-ledger.x")
198+
{
199+
continue;
200+
}
189201
bool found = false;
190202
for (auto const& rust : rustHashes)
191203
{
@@ -351,7 +363,7 @@ main(int argc, char* const* argv)
351363
rust_bridge::check_sensible_soroban_config_for_protocol(
352364
Config::CURRENT_LEDGER_PROTOCOL_VERSION);
353365

354-
// Disable XDR hash checking in vnext builds
366+
// Temporarily disable XDR hash checking in vnext builds
355367
#ifndef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
356368
checkXDRFileIdentity();
357369
#endif

‎src/protocol-curr/xdr

‎src/protocol-next/xdr

‎src/transactions/TransactionUtils.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -1986,10 +1986,15 @@ isTransactionXDRValidForProtocol(uint32_t currProtocol, Config const& cfg,
19861986
uint32_t maxProtocol = cfg.CURRENT_LEDGER_PROTOCOL_VERSION;
19871987
// If we could parse the XDR when ledger is using the maximum supported
19881988
// protocol version, then XDR has to be valid.
1989+
// This check is temporarily disabled because we're using different XDR in
1990+
// Rust and Core, and thus even at max protocol the check is necessary.
1991+
// if (maxProtocol == currProtocol)
1992+
//{
1993+
// return true;
1994+
//}
19891995
// This check also is pointless before protocol 21 as Soroban environment
19901996
// doesn't support XDR versions before 21.
1991-
if (maxProtocol == currProtocol ||
1992-
protocolVersionIsBefore(currProtocol, ProtocolVersion::V_21))
1997+
if (protocolVersionIsBefore(currProtocol, ProtocolVersion::V_21))
19931998
{
19941999
return true;
19952000
}

‎src/transactions/test/TxEnvelopeTests.cpp

+64
Original file line numberDiff line numberDiff line change
@@ -2531,6 +2531,70 @@ TEST_CASE("XDR protocol compatibility validation", "[tx][envelope]")
25312531
}
25322532
}
25332533

2534+
// This is a temporary case until we have released the next minor version.
2535+
// This can be safely removed after that (the test will also fail as soon as we
2536+
// caught up with the next XDR on the Rust side).
2537+
TEST_CASE("new ScAddress variants are not decodable by Rust", "[tx][envelope]")
2538+
{
2539+
2540+
VirtualClock clock;
2541+
auto cfg = getTestConfig();
2542+
cfg.TESTING_UPGRADE_LEDGER_PROTOCOL_VERSION =
2543+
Config::CURRENT_LEDGER_PROTOCOL_VERSION;
2544+
auto app = createTestApplication(clock, cfg);
2545+
auto root = TestAccount::createRoot(*app);
2546+
Operation op;
2547+
op.body.type(INVOKE_HOST_FUNCTION);
2548+
op.body.invokeHostFunctionOp().hostFunction.type(
2549+
HOST_FUNCTION_TYPE_INVOKE_CONTRACT);
2550+
2551+
LedgerSnapshot ls(*app);
2552+
SECTION("Invalid ScAddress in function args")
2553+
{
2554+
auto& val = op.body.invokeHostFunctionOp()
2555+
.hostFunction.invokeContract()
2556+
.args.emplace_back();
2557+
val.type(SCV_ADDRESS);
2558+
val.address().type(SC_ADDRESS_TYPE_MUXED_ACCOUNT);
2559+
val.address().muxedAccount().id = 123;
2560+
auto tx =
2561+
sorobanTransactionFrameFromOps(app->getNetworkID(), root, {op}, {},
2562+
SorobanResources(), 1000, 1'000'000);
2563+
2564+
auto res = tx->checkValid(app->getAppConnector(), ls, 0, 0, 0);
2565+
REQUIRE(res->getResult().result.code() == txMALFORMED);
2566+
}
2567+
SECTION("Invalid ScAddress in auth")
2568+
{
2569+
auto& authEntry = op.body.invokeHostFunctionOp().auth.emplace_back();
2570+
authEntry.rootInvocation.function.type(
2571+
SOROBAN_AUTHORIZED_FUNCTION_TYPE_CONTRACT_FN);
2572+
auto& address =
2573+
authEntry.rootInvocation.function.contractFn().contractAddress;
2574+
address.type(SC_ADDRESS_TYPE_CLAIMABLE_BALANCE);
2575+
address.claimableBalanceId().v0()[0] = 1;
2576+
auto tx =
2577+
sorobanTransactionFrameFromOps(app->getNetworkID(), root, {op}, {},
2578+
SorobanResources(), 1000, 1'000'000);
2579+
auto res = tx->checkValid(app->getAppConnector(), ls, 0, 0, 0);
2580+
REQUIRE(res->getResult().result.code() == txMALFORMED);
2581+
}
2582+
SECTION("Invalid ScAddress in footprint")
2583+
{
2584+
SorobanResources resources;
2585+
auto& key = resources.footprint.readOnly.emplace_back();
2586+
key.type(CONTRACT_DATA);
2587+
auto& address = key.contractData().contract;
2588+
2589+
address.type(SC_ADDRESS_TYPE_LIQUIDITY_POOL);
2590+
address.liquidityPoolId()[1] = 10;
2591+
auto tx = sorobanTransactionFrameFromOps(
2592+
app->getNetworkID(), root, {op}, {}, resources, 1000, 1'000'000);
2593+
auto res = tx->checkValid(app->getAppConnector(), ls, 0, 0, 0);
2594+
REQUIRE(res->getResult().result.code() == txMALFORMED);
2595+
}
2596+
}
2597+
25342598
TEST_CASE_VERSIONS("Soroban extension for non-Soroban tx",
25352599
"[tx][envelope][soroban]")
25362600
{

0 commit comments

Comments
 (0)