Merge branch 'master' into ungate-cap-0083-0085

Conflict in src/util/ProtocolVersion.h: stellar#5393 added
TX_ED25519_VERIFY_BUDGET_PROTOCOL_VERSION in the same place this branch
removed the #ifdef CAP_0085_EXECUTABLE_REF. Resolution keeps both -- the
new constant, and EXTERNAL_EXECUTABLE_REF_PROTOCOL_VERSION ungated.

Also bumps stellar-quorum-analyzer to 502a354 (stellar#23), which repins its
stellar-xdr to the same git rev as the p28 host so their
XDR_FILES_SHA256 agree and checkXDRFileIdentity passes.

Author: sisuresh

Cargo.lock

@@ -198,7 +198,7 @@ optional = true
 [dependencies.stellar-quorum-analyzer]
 version = "0.1.0"
 git = "https://github.com/stellar/stellar-quorum-analyzer"
-rev = "b422b366ede667c030c78ffe18b2010194698dbd"
+rev = "502a354eb9a31cf86098be84aa1b3081767fa3c7"
 
 [features]
 

src/rust/Cargo.toml

@@ -28,22 +28,19 @@ SignatureChecker::SignatureChecker(
     : mProtocolVersion{protocolVersion}
     , mContentsHash{contentsHash}
     , mSignatures{signatures}
-    , mIsOverlayValidation{isOverlayValidation}
+    , mEnforceVerifyBudget{
+          isOverlayValidation ||
+          protocolVersionStartsFrom(protocolVersion,
+                                    TX_ED25519_VERIFY_BUDGET_PROTOCOL_VERSION)}
 {
     mUsedSignatures.resize(mSignatures.size());
 }
 
-bool
-SignatureChecker::isOverlayValidation() const
-{
-    return mIsOverlayValidation;
-}
-
 bool
 SignatureChecker::isOverVerificationBudget() const
 {
-    return mIsOverlayValidation &&
-           mTxEd25519Verifications >= OVERLAY_TX_ED25519_VERIFY_BUDGET;
+    return mEnforceVerifyBudget &&
+           mTxEd25519Verifications >= TX_ED25519_VERIFY_BUDGET;
 }
 
 bool

src/transactions/SignatureChecker.cpp

@@ -43,8 +43,11 @@ class SignatureChecker
     void disableCacheMetricsTracking();
 #endif // BUILD_TESTS
 
-    bool isOverlayValidation() const;
-    static constexpr uint32_t OVERLAY_TX_ED25519_VERIFY_BUDGET = 1000;
+    // Maximum number of ed25519 signature verifications a single
+    // SignatureChecker will perform. Enforced during overlay validation at all
+    // protocol versions, and on all validation and apply paths starting from
+    // TX_ED25519_VERIFY_BUDGET_PROTOCOL_VERSION.
+    static constexpr uint32_t TX_ED25519_VERIFY_BUDGET = 1000;
 
     // Reset and return the counts of signature checks performed as part of
     // transaction `checkValid` or apply flow. The first element of the pair is
@@ -57,9 +60,13 @@ class SignatureChecker
     Hash const& mContentsHash;
     xdr::xvector<DecoratedSignature, 20> const& mSignatures;
     bool mTrackCacheMetrics{true};
-    bool mIsOverlayValidation{false};
+
+    // Whether this checker enforces TX_ED25519_VERIFY_BUDGET.
+    bool const mEnforceVerifyBudget;
 
     std::vector<bool> mUsedSignatures;
+
+    // Number of ed25519 verifications performed by this checker
     uint32_t mTxEd25519Verifications{0};
 
     bool isOverVerificationBudget() const;

src/transactions/SignatureChecker.h

@@ -73,6 +73,9 @@ constexpr ProtocolVersion EMPTY_TX_SET_PROTOCOL_VERSION = ProtocolVersion::V_28;
 constexpr ProtocolVersion INVOKE_HOST_FUNCTION_V2_PROTOCOL_VERSION =
     ProtocolVersion::V_28;
 
+constexpr ProtocolVersion TX_ED25519_VERIFY_BUDGET_PROTOCOL_VERSION =
+    ProtocolVersion::V_28;
+
 constexpr ProtocolVersion EXTERNAL_EXECUTABLE_REF_PROTOCOL_VERSION =
     ProtocolVersion::V_28;