Remove rust_bridge checkValid roundtrip

Author: SirTyson

src/transactions/FeeBumpTransactionFrame.cpp

@@ -23,6 +23,7 @@
 #include "util/GlobalChecks.h"
 #include "util/ProtocolVersion.h"
 #include "util/numeric128.h"
+#include "xdrpp/depth_checker.h"
 #include "xdrpp/marshal.h"
 
 #include <numeric>
@@ -248,9 +249,7 @@ FeeBumpTransactionFrame::checkValid(
     uint64_t lowerBoundCloseTimeOffset, uint64_t upperBoundCloseTimeOffset,
     DiagnosticEventManager& diagnosticEvents) const
 {
-    if (!checkVNext(ls.getLedgerHeader().current().ledgerVersion,
-                    app.getConfig(), mEnvelope) ||
-        !XDRProvidesValidFee())
+    if (!xdr::check_xdr_depth(mEnvelope, 500) || !XDRProvidesValidFee())
     {
         return FeeBumpMutableTransactionResult::createTxError(txMALFORMED);
     }

src/transactions/TransactionFrame.cpp

@@ -40,6 +40,7 @@
 #include "util/XDRStream.h"
 #include "xdr/Stellar-contract.h"
 #include "xdr/Stellar-ledger.h"
+#include "xdrpp/depth_checker.h"
 #include "xdrpp/marshal.h"
 #include "xdrpp/printer.h"
 #include <Tracy.hpp>
@@ -1725,8 +1726,7 @@ TransactionFrame::checkValid(AppConnector& app, LedgerSnapshot const& ls,
     // `checkValidWithOptionallyChargedFee` in order to not validate the
     // envelope XDR twice for the fee bump transactions (they use
     // `checkValidWithOptionallyChargedFee` for the inner tx).
-    if (!checkVNext(ls.getLedgerHeader().current().ledgerVersion,
-                    app.getConfig(), mEnvelope))
+    if (!xdr::check_xdr_depth(mEnvelope, 500))
     {
         return MutableTransactionResult::createTxError(txMALFORMED);
     }

src/transactions/TransactionUtils.cpp

@@ -2164,22 +2164,6 @@ hasMuxedAccount(TransactionEnvelope const& e)
     return c.mHasMuxedAccount;
 }
 
-bool
-checkVNext(uint32_t currProtocol, Config const& cfg,
-           TransactionEnvelope const& envelope)
-{
-    uint32_t maxProtocol = cfg.CURRENT_LEDGER_PROTOCOL_VERSION;
-    if (!xdr::check_xdr_depth(envelope, 500))
-    {
-        return false;
-    }
-
-    auto cxxBuf = CxxBuf{
-        std::make_unique<std::vector<uint8_t>>(xdr::xdr_to_opaque(envelope))};
-    return rust_bridge::can_parse_transaction(maxProtocol, currProtocol, cxxBuf,
-                                              1000);
-}
-
 ClaimAtom
 makeClaimAtom(uint32_t ledgerVersion, AccountID const& accountID,
               int64_t offerID, Asset const& wheat, int64_t numWheatReceived,

src/transactions/TransactionUtils.h

@@ -262,9 +262,6 @@ bool accountFlagMaskCheckIsValid(uint32_t flag, uint32_t ledgerVersion);
 
 bool hasMuxedAccount(TransactionEnvelope const& e);
 
-bool checkVNext(uint32_t currProtocol, Config const& cfg,
-                TransactionEnvelope const& envelope);
-
 uint64_t getUpperBoundCloseTimeOffset(Application& app, uint64_t lastCloseTime);
 
 bool hasAccountEntryExtV2(AccountEntry const& ae);

src/transactions/test/TxEnvelopeTests.cpp

@@ -2496,127 +2496,6 @@ TEST_CASE("soroban txs not allowed before protocol upgrade",
     REQUIRE(!tx->checkValidForTesting(app->getAppConnector(), ltx, 0, 0, 0));
     REQUIRE(tx->getResultCode() == txMALFORMED);
 }
-
-TEST_CASE("XDR protocol 22 compatibility validation", "[tx][envelope]")
-{
-    auto validateTx = [](ProtocolVersion protocolVersion) {
-        VirtualClock clock;
-        auto cfg = getTestConfig();
-        cfg.TESTING_UPGRADE_LEDGER_PROTOCOL_VERSION =
-            static_cast<uint32_t>(protocolVersion);
-        auto app = createTestApplication(clock, cfg);
-        auto root = app->getRoot();
-        Operation op;
-        op.body.type(INVOKE_HOST_FUNCTION);
-        op.body.invokeHostFunctionOp().hostFunction.type(
-            HOST_FUNCTION_TYPE_CREATE_CONTRACT_V2);
-
-        auto tx =
-            sorobanTransactionFrameFromOps(app->getNetworkID(), *root, {op}, {},
-                                           SorobanResources(), 1000, 1'000'000);
-        LedgerTxn ltx(app->getLedgerTxnRoot());
-        return tx->checkValid(app->getAppConnector(), ltx, 0, 0, 0);
-    };
-    SECTION("not valid in protocol 21")
-    {
-        auto res = validateTx(ProtocolVersion::V_21);
-        REQUIRE(res->getResultCode() == txMALFORMED);
-    }
-    SECTION("valid in protocol 22")
-    {
-        auto res = validateTx(ProtocolVersion::V_22);
-        REQUIRE(res->isSuccess());
-    }
-}
-
-TEST_CASE("XDR protocol 23 compatibility validation", "[tx][envelope]")
-{
-    auto runTest = [](ProtocolVersion protocolVersion, bool expectSuccess) {
-        VirtualClock clock;
-        auto cfg = getTestConfig();
-        cfg.TESTING_UPGRADE_LEDGER_PROTOCOL_VERSION =
-            static_cast<uint32_t>(protocolVersion);
-        auto app = createTestApplication(clock, cfg);
-        auto root = app->getRoot();
-        Operation op;
-        op.body.type(INVOKE_HOST_FUNCTION);
-        op.body.invokeHostFunctionOp().hostFunction.type(
-            HOST_FUNCTION_TYPE_INVOKE_CONTRACT);
-
-        LedgerSnapshot ls(*app);
-        SECTION("muxed account ScAddress in function args")
-        {
-            auto& val = op.body.invokeHostFunctionOp()
-                            .hostFunction.invokeContract()
-                            .args.emplace_back();
-            val.type(SCV_ADDRESS);
-            val.address().type(SC_ADDRESS_TYPE_MUXED_ACCOUNT);
-            val.address().muxedAccount().id = 123;
-            auto tx = sorobanTransactionFrameFromOps(
-                app->getNetworkID(), *root, {op}, {}, SorobanResources(), 1000,
-                1'000'000);
-
-            auto res = tx->checkValid(app->getAppConnector(), ls, 0, 0, 0);
-            REQUIRE(res->isSuccess() == expectSuccess);
-            if (!expectSuccess)
-            {
-                REQUIRE(res->getResultCode() == txMALFORMED);
-            }
-        }
-        SECTION("claimable balance ScAddress in auth")
-        {
-            auto& authEntry =
-                op.body.invokeHostFunctionOp().auth.emplace_back();
-            authEntry.rootInvocation.function.type(
-                SOROBAN_AUTHORIZED_FUNCTION_TYPE_CONTRACT_FN);
-            auto& address =
-                authEntry.rootInvocation.function.contractFn().contractAddress;
-            address.type(SC_ADDRESS_TYPE_CLAIMABLE_BALANCE);
-            address.claimableBalanceId().v0()[0] = 1;
-            auto tx = sorobanTransactionFrameFromOps(
-                app->getNetworkID(), *root, {op}, {}, SorobanResources(), 1000,
-                1'000'000);
-            auto res = tx->checkValid(app->getAppConnector(), ls, 0, 0, 0);
-            REQUIRE(res->isSuccess() == expectSuccess);
-            if (!expectSuccess)
-            {
-                REQUIRE(res->getResultCode() == txMALFORMED);
-            }
-        }
-        SECTION("liquidity pool ScAddress in footprint")
-        {
-            Operation ttlOp;
-            ttlOp.body.type(EXTEND_FOOTPRINT_TTL);
-
-            SorobanResources resources;
-            auto& key = resources.footprint.readOnly.emplace_back();
-            key.type(CONTRACT_DATA);
-            auto& address = key.contractData().contract;
-
-            address.type(SC_ADDRESS_TYPE_LIQUIDITY_POOL);
-            address.liquidityPoolId()[1] = 10;
-            auto tx = sorobanTransactionFrameFromOps(app->getNetworkID(), *root,
-                                                     {ttlOp}, {}, resources,
-                                                     1000, 1'000'000);
-            auto res = tx->checkValid(app->getAppConnector(), ls, 0, 0, 0);
-            REQUIRE(res->isSuccess() == expectSuccess);
-            if (!expectSuccess)
-            {
-                REQUIRE(res->getResultCode() == txMALFORMED);
-            }
-        }
-    };
-
-    SECTION("not valid in protocol 22")
-    {
-        runTest(ProtocolVersion::V_22, false);
-    }
-    SECTION("valid in protocol 23")
-    {
-        runTest(ProtocolVersion::V_23, true);
-    }
-}
-
 TEST_CASE_VERSIONS("Soroban extension for non-Soroban tx",
                    "[tx][envelope][soroban]")
 {