Remove redundant passing around of protocol version

bboston7 · bboston7 · commit 16979788576c · 2025-01-15T15:53:19.000-08:00
diff --git a/src/herder/TransactionQueue.cpp b/src/herder/TransactionQueue.cpp
@@ -388,7 +388,7 @@ TransactionQueue::canAdd(
             {
                 auto txResult = tx->createSuccessResult();
                 if (!tx->checkSorobanResourceAndSetError(
-                        *mValidationSnapshot, ledgerVersion, txResult))
+                        *mValidationSnapshot, txResult))
                 {
                     return AddResult(AddResultCode::ADD_STATUS_ERROR, txResult);
                 }
diff --git a/src/transactions/FeeBumpTransactionFrame.cpp b/src/transactions/FeeBumpTransactionFrame.cpp
@@ -197,11 +197,9 @@ FeeBumpTransactionFrame::checkValid(ValidationConnector const& vc,
 
 bool
 FeeBumpTransactionFrame::checkSorobanResourceAndSetError(
-    ValidationConnector const& vc, uint32_t ledgerVersion,
-    MutableTxResultPtr txResult) const
+    ValidationConnector const& vc, MutableTxResultPtr txResult) const
 {
-    return mInnerTx->checkSorobanResourceAndSetError(vc, ledgerVersion,
-                                                     txResult);
+    return mInnerTx->checkSorobanResourceAndSetError(vc, txResult);
 }
 
 bool
diff --git a/src/transactions/FeeBumpTransactionFrame.h b/src/transactions/FeeBumpTransactionFrame.h
@@ -82,7 +82,6 @@ class FeeBumpTransactionFrame : public TransactionFrameBase
                uint64_t upperBoundCloseTimeOffset) const override;
     bool
     checkSorobanResourceAndSetError(ValidationConnector const& app,
-                                    uint32_t ledgerVersion,
                                     MutableTxResultPtr txResult) const override;
 
     MutableTxResultPtr createSuccessResult() const override;
diff --git a/src/transactions/TransactionFrame.cpp b/src/transactions/TransactionFrame.cpp
@@ -537,11 +537,12 @@ TransactionFrame::validateSorobanOpsConsistency() const
 }
 
 bool
-TransactionFrame::validateSorobanResources(SorobanNetworkConfig const& config,
-                                           Config const& appConfig,
-                                           uint32_t protocolVersion,
+TransactionFrame::validateSorobanResources(ValidationConnector const& vc,
                                            SorobanTxData& sorobanData) const
 {
+    SorobanNetworkConfig const& config = vc.getSorobanNetworkConfig();
+    Config const& appConfig = vc.getConfig();
+    uint32_t protocolVersion = vc.getCurrentProtocolVersion();
     auto const& resources = sorobanResources();
     auto const& readEntries = resources.footprint.readOnly;
     auto const& writeEntries = resources.footprint.readWrite;
@@ -945,7 +946,7 @@ TransactionFrame::commonValidPreSeqNum(
             return false;
         }
 
-        if (!checkSorobanResourceAndSetError(vc, ledgerVersion, txResult))
+        if (!checkSorobanResourceAndSetError(vc, txResult))
         {
             return false;
         }
@@ -1501,11 +1502,9 @@ TransactionFrame::checkValid(ValidationConnector const& vc,
 
 bool
 TransactionFrame::checkSorobanResourceAndSetError(
-    ValidationConnector const& vc, uint32_t ledgerVersion,
-    MutableTxResultPtr txResult) const
+    ValidationConnector const& vc, MutableTxResultPtr txResult) const
 {
-    if (!validateSorobanResources(vc.getSorobanNetworkConfig(), vc.getConfig(),
-                                  ledgerVersion, *txResult->getSorobanData()))
+    if (!validateSorobanResources(vc, *txResult->getSorobanData()))
     {
         txResult->setInnermostResultCode(txSOROBAN_INVALID);
         return false;
diff --git a/src/transactions/TransactionFrame.h b/src/transactions/TransactionFrame.h
@@ -136,9 +136,7 @@ class TransactionFrame : public TransactionFrameBase
     bool extraSignersExist() const;
 
     bool validateSorobanOpsConsistency() const;
-    bool validateSorobanResources(SorobanNetworkConfig const& config,
-                                  Config const& appConfig,
-                                  uint32_t protocolVersion,
+    bool validateSorobanResources(ValidationConnector const& vc,
                                   SorobanTxData& sorobanData) const;
     int64_t refundSorobanFee(AbstractLedgerTxn& ltx, AccountID const& feeSource,
                              MutableTransactionResultBase& txResult) const;
@@ -218,7 +216,6 @@ class TransactionFrame : public TransactionFrameBase
                uint64_t upperBoundCloseTimeOffset) const override;
     bool
     checkSorobanResourceAndSetError(ValidationConnector const& vc,
-                                    uint32_t ledgerVersion,
                                     MutableTxResultPtr txResult) const override;
 
     MutableTxResultPtr createSuccessResult() const override;
diff --git a/src/transactions/TransactionFrameBase.h b/src/transactions/TransactionFrameBase.h
@@ -102,7 +102,6 @@ class TransactionFrameBase
                uint64_t upperBoundCloseTimeOffset) const = 0;
     virtual bool
     checkSorobanResourceAndSetError(ValidationConnector const& vc,
-                                    uint32_t ledgerVersion,
                                     MutableTxResultPtr txResult) const = 0;
 
     virtual MutableTxResultPtr createSuccessResult() const = 0;
diff --git a/src/transactions/test/TransactionTestFrame.cpp b/src/transactions/test/TransactionTestFrame.cpp
@@ -144,11 +144,9 @@ TransactionTestFrame::checkValidForTesting(AppConnector& app,
 
 bool
 TransactionTestFrame::checkSorobanResourceAndSetError(
-    ValidationConnector const& vc, uint32_t ledgerVersion,
-    MutableTxResultPtr txResult) const
+    ValidationConnector const& vc, MutableTxResultPtr txResult) const
 {
-    auto ret = mTransactionFrame->checkSorobanResourceAndSetError(
-        vc, ledgerVersion, txResult);
+    auto ret = mTransactionFrame->checkSorobanResourceAndSetError(vc, txResult);
     mTransactionTxResult = txResult;
     return ret;
 }
diff --git a/src/transactions/test/TransactionTestFrame.h b/src/transactions/test/TransactionTestFrame.h
@@ -72,7 +72,6 @@ class TransactionTestFrame : public TransactionFrameBase
                uint64_t upperBoundCloseTimeOffset) const override;
     bool
     checkSorobanResourceAndSetError(ValidationConnector const& vc,
-                                    uint32_t ledgerVersion,
                                     MutableTxResultPtr txResult) const override;
 
     MutableTxResultPtr createSuccessResult() const override;

Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ TransactionQueue::canAdd(`
`388`	`388`	`{`
`389`	`389`	`auto txResult = tx->createSuccessResult();`
`390`	`390`	`if (!tx->checkSorobanResourceAndSetError(`
`391`		`- *mValidationSnapshot, ledgerVersion, txResult))`
	`391`	`+ *mValidationSnapshot, txResult))`
`392`	`392`	`{`
`393`	`393`	`return AddResult(AddResultCode::ADD_STATUS_ERROR, txResult);`
`394`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,11 +197,9 @@ FeeBumpTransactionFrame::checkValid(ValidationConnector const& vc,`
`197`	`197`
`198`	`198`	`bool`
`199`	`199`	`FeeBumpTransactionFrame::checkSorobanResourceAndSetError(`
`200`		`- ValidationConnector const& vc, uint32_t ledgerVersion,`
`201`		`- MutableTxResultPtr txResult) const`
	`200`	`+ ValidationConnector const& vc, MutableTxResultPtr txResult) const`
`202`	`201`	`{`
`203`		`- return mInnerTx->checkSorobanResourceAndSetError(vc, ledgerVersion,`
`204`		`- txResult);`
	`202`	`+ return mInnerTx->checkSorobanResourceAndSetError(vc, txResult);`
`205`	`203`	`}`
`206`	`204`
`207`	`205`	`bool`
Original file line number	Diff line number	Diff line change
`@@ -537,11 +537,12 @@ TransactionFrame::validateSorobanOpsConsistency() const`
`537`	`537`	`}`
`538`	`538`
`539`	`539`	`bool`
`540`		`-TransactionFrame::validateSorobanResources(SorobanNetworkConfig const& config,`
`541`		`- Config const& appConfig,`
`542`		`- uint32_t protocolVersion,`
	`540`	`+TransactionFrame::validateSorobanResources(ValidationConnector const& vc,`
`543`	`541`	`SorobanTxData& sorobanData) const`
`544`	`542`	`{`
	`543`	`+ SorobanNetworkConfig const& config = vc.getSorobanNetworkConfig();`
	`544`	`+ Config const& appConfig = vc.getConfig();`
	`545`	`+ uint32_t protocolVersion = vc.getCurrentProtocolVersion();`
`545`	`546`	`auto const& resources = sorobanResources();`
`546`	`547`	`auto const& readEntries = resources.footprint.readOnly;`
`547`	`548`	`auto const& writeEntries = resources.footprint.readWrite;`
`@@ -945,7 +946,7 @@ TransactionFrame::commonValidPreSeqNum(`
`945`	`946`	`return false;`
`946`	`947`	`}`
`947`	`948`
`948`		`- if (!checkSorobanResourceAndSetError(vc, ledgerVersion, txResult))`
	`949`	`+ if (!checkSorobanResourceAndSetError(vc, txResult))`
`949`	`950`	`{`
`950`	`951`	`return false;`
`951`	`952`	`}`
`@@ -1501,11 +1502,9 @@ TransactionFrame::checkValid(ValidationConnector const& vc,`
`1501`	`1502`
`1502`	`1503`	`bool`
`1503`	`1504`	`TransactionFrame::checkSorobanResourceAndSetError(`
`1504`		`- ValidationConnector const& vc, uint32_t ledgerVersion,`
`1505`		`- MutableTxResultPtr txResult) const`
	`1505`	`+ ValidationConnector const& vc, MutableTxResultPtr txResult) const`
`1506`	`1506`	`{`
`1507`		`- if (!validateSorobanResources(vc.getSorobanNetworkConfig(), vc.getConfig(),`
`1508`		`- ledgerVersion, *txResult->getSorobanData()))`
	`1507`	`+ if (!validateSorobanResources(vc, *txResult->getSorobanData()))`
`1509`	`1508`	`{`
`1510`	`1509`	`txResult->setInnermostResultCode(txSOROBAN_INVALID);`
`1511`	`1510`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,9 @@ TransactionTestFrame::checkValidForTesting(AppConnector& app,`
`144`	`144`
`145`	`145`	`bool`
`146`	`146`	`TransactionTestFrame::checkSorobanResourceAndSetError(`
`147`		`- ValidationConnector const& vc, uint32_t ledgerVersion,`
`148`		`- MutableTxResultPtr txResult) const`
	`147`	`+ ValidationConnector const& vc, MutableTxResultPtr txResult) const`
`149`	`148`	`{`
`150`		`- auto ret = mTransactionFrame->checkSorobanResourceAndSetError(`
`151`		`- vc, ledgerVersion, txResult);`
	`149`	`+ auto ret = mTransactionFrame->checkSorobanResourceAndSetError(vc, txResult);`
`152`	`150`	`mTransactionTxResult = txResult;`
`153`	`151`	`return ret;`
`154`	`152`	`}`