fix test

yinyiqian1 · yinyiqian1 · commit 5ab0fb02baab · 2024-12-06T00:54:05.000-05:00
diff --git a/include/xrpl/protocol/STTxWr.h b/include/xrpl/protocol/STTxWr.h
@@ -35,16 +35,16 @@ namespace ripple {
 class STTxWr
 {
 private:
-    STTx tx_;           // Wrap an instance of STTx
+    std::shared_ptr<STTx> tx_;  // Wrap an instance of STTx
     bool isDelegated_;  // if the transaction is delegated by another account
 
 public:
-    explicit STTxWr(STTx tx, bool isDelegated)
-        : tx_(tx), isDelegated_(isDelegated)
+    explicit STTxWr(STTx const& tx, bool isDelegated)
+        : tx_(std::make_shared<STTx>(tx)), isDelegated_(isDelegated)
     {
     }
 
-    STTx
+    std::shared_ptr<STTx>
     getTx() const
     {
         return tx_;
@@ -60,9 +60,9 @@ class STTxWr
     getAccountID(SField const& field) const
     {
         if (field == sfAccount)
-            return tx_.isFieldPresent(sfOnBehalfOf) ? *tx_[~sfOnBehalfOf]
-                                                    : tx_[sfAccount];
-        return tx_.getAccountID(field);
+            return tx_->isFieldPresent(sfOnBehalfOf) ? *(*tx_)[~sfOnBehalfOf]
+                                                     : (*tx_)[sfAccount];
+        return tx_->getAccountID(field);
     }
 
     template <class T>
@@ -71,7 +71,7 @@ class STTxWr
         typename T::value_type>::type
     operator[](TypedField<T> const& f) const
     {
-        return tx_[f];
+        return (*tx_)[f];
     }
 
     // When Type is SF_ACCOUNT and also field name is sfAccount, we need to
@@ -84,124 +84,124 @@ class STTxWr
     operator[](TypedField<T> const& f) const
     {
         if (f == sfAccount)
-            return tx_.isFieldPresent(sfOnBehalfOf) ? *tx_[~sfOnBehalfOf]
-                                                    : tx_[sfAccount];
-        return tx_[f];
+            return tx_->isFieldPresent(sfOnBehalfOf) ? *(*tx_)[~sfOnBehalfOf]
+                                                     : (*tx_)[sfAccount];
+        return (*tx_)[f];
     }
 
     template <class T>
     std::optional<std::decay_t<typename T::value_type>>
     operator[](OptionaledField<T> const& of) const
     {
-        return tx_[of];
+        return (*tx_)[of];
     }
 
     uint256
     getTransactionID() const
     {
-        return tx_.getTransactionID();
+        return tx_->getTransactionID();
     }
 
     TxType
     getTxnType() const
     {
-        return tx_.getTxnType();
+        return tx_->getTxnType();
     }
 
     std::uint32_t
     getFlags() const
     {
-        return tx_.getFlags();
+        return tx_->getFlags();
     }
 
     bool
     isFieldPresent(SField const& field) const
     {
-        return tx_.isFieldPresent(field);
+        return tx_->isFieldPresent(field);
     }
 
     Json::Value
     getJson(JsonOptions options) const
     {
-        return tx_.getJson(options);
+        return tx_->getJson(options);
     }
 
     void
     add(Serializer& s) const
     {
-        tx_.add(s);
+        tx_->add(s);
     }
 
     unsigned char
     getFieldU8(SField const& field) const
     {
-        return tx_.getFieldU8(field);
+        return tx_->getFieldU8(field);
     }
 
     std::uint32_t
     getFieldU32(SField const& field) const
     {
-        return tx_.getFieldU32(field);
+        return tx_->getFieldU32(field);
     }
 
     uint256
     getFieldH256(SField const& field) const
     {
-        return tx_.getFieldH256(field);
+        return tx_->getFieldH256(field);
     }
 
     Blob
     getFieldVL(SField const& field) const
     {
-        return tx_.getFieldVL(field);
+        return tx_->getFieldVL(field);
     }
 
     STAmount const&
     getFieldAmount(SField const& field) const
     {
-        return tx_.getFieldAmount(field);
+        return tx_->getFieldAmount(field);
     }
 
     STPathSet const&
     getFieldPathSet(SField const& field) const
     {
-        return tx_.getFieldPathSet(field);
+        return tx_->getFieldPathSet(field);
     }
 
     const STVector256&
     getFieldV256(SField const& field) const
     {
-        return tx_.getFieldV256(field);
+        return tx_->getFieldV256(field);
     }
 
     const STArray&
     getFieldArray(SField const& field) const
     {
-        return tx_.getFieldArray(field);
+        return tx_->getFieldArray(field);
     }
 
     Blob
     getSigningPubKey() const
     {
-        return tx_.getSigningPubKey();
+        return tx_->getSigningPubKey();
     }
 
     Blob
     getSignature() const
     {
-        return tx_.getSignature();
+        return tx_->getSignature();
     }
 
     bool
     isFlag(std::uint32_t f) const
     {
-        return tx_.isFlag(f);
+        return tx_->isFlag(f);
     }
 
     SeqProxy
     getSeqProxy() const
     {
-        return tx_.getSeqProxy();
+        return tx_->getSeqProxy();
     }
 };
 
diff --git a/src/xrpld/app/misc/CredentialHelpers.cpp b/src/xrpld/app/misc/CredentialHelpers.cpp
@@ -243,7 +243,7 @@ verifyDepositPreauth(
     bool const credentialsPresent = ctx.tx.isFieldPresent(sfCredentialIDs);
 
     if (credentialsPresent &&
-        credentials::removeExpired(ctx.view(), ctx.tx.getTx(), ctx.journal))
+        credentials::removeExpired(ctx.view(), *ctx.tx.getTx(), ctx.journal))
         return tecEXPIRED;
 
     if (sleDst && (sleDst->getFlags() & lsfDepositAuth))
diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.cpp b/src/xrpld/app/tx/detail/AMMWithdraw.cpp
@@ -470,7 +470,7 @@ AMMWithdraw::withdraw(
         lpTokensWithdraw,
         tfee,
         FreezeHandling::fhZERO_IF_FROZEN,
-        isWithdrawAll(ctx_.tx.getTx()),
+        isWithdrawAll(*ctx_.tx.getTx()),
         mPriorBalance,
         j_);
     return {ter, newLPTokenBalance};
@@ -707,7 +707,7 @@ AMMWithdraw::equalWithdrawTokens(
             lpTokensWithdraw,
             tfee,
             FreezeHandling::fhZERO_IF_FROZEN,
-            isWithdrawAll(ctx_.tx.getTx()),
+            isWithdrawAll(*ctx_.tx.getTx()),
             mPriorBalance,
             ctx_.journal);
     return {ter, newLPTokenBalance};
diff --git a/src/xrpld/app/tx/detail/ApplyContext.cpp b/src/xrpld/app/tx/detail/ApplyContext.cpp
@@ -58,7 +58,7 @@ ApplyContext::discard()
 void
 ApplyContext::apply(TER ter)
 {
-    view_->apply(base_, tx.getTx(), ter, journal);
+    view_->apply(base_, *tx.getTx(), ter, journal);
 }
 
 std::size_t
diff --git a/src/xrpld/app/tx/detail/CashCheck.cpp b/src/xrpld/app/tx/detail/CashCheck.cpp
@@ -138,7 +138,7 @@ CashCheck::preclaim(PreclaimContext const& ctx)
         STAmount const value{[](STTx const& tx) {
             auto const optAmount = tx[~sfAmount];
             return optAmount ? *optAmount : tx[sfDeliverMin];
-        }(ctx.tx.getTx())};
+        }(*ctx.tx.getTx())};
 
         STAmount const sendMax = sleCheck->at(sfSendMax);
         Currency const currency{value.getCurrency()};
diff --git a/src/xrpld/app/tx/detail/Change.cpp b/src/xrpld/app/tx/detail/Change.cpp
@@ -359,9 +359,9 @@ Change::applyFee()
     };
     if (view().rules().enabled(featureXRPFees))
     {
-        set(feeObject, ctx_.tx.getTx(), sfBaseFeeDrops);
-        set(feeObject, ctx_.tx.getTx(), sfReserveBaseDrops);
-        set(feeObject, ctx_.tx.getTx(), sfReserveIncrementDrops);
+        set(feeObject, *ctx_.tx.getTx(), sfBaseFeeDrops);
+        set(feeObject, *ctx_.tx.getTx(), sfReserveBaseDrops);
+        set(feeObject, *ctx_.tx.getTx(), sfReserveIncrementDrops);
         // Ensure the old fields are removed
         feeObject->makeFieldAbsent(sfBaseFee);
         feeObject->makeFieldAbsent(sfReferenceFeeUnits);
@@ -370,10 +370,10 @@ Change::applyFee()
     }
     else
     {
-        set(feeObject, ctx_.tx.getTx(), sfBaseFee);
-        set(feeObject, ctx_.tx.getTx(), sfReferenceFeeUnits);
-        set(feeObject, ctx_.tx.getTx(), sfReserveBase);
-        set(feeObject, ctx_.tx.getTx(), sfReserveIncrement);
+        set(feeObject, *ctx_.tx.getTx(), sfBaseFee);
+        set(feeObject, *ctx_.tx.getTx(), sfReferenceFeeUnits);
+        set(feeObject, *ctx_.tx.getTx(), sfReserveBase);
+        set(feeObject, *ctx_.tx.getTx(), sfReserveIncrement);
     }
 
     view().update(feeObject);
diff --git a/src/xrpld/app/tx/detail/CreateOffer.cpp b/src/xrpld/app/tx/detail/CreateOffer.cpp
@@ -36,7 +36,8 @@ CreateOffer::makeTxConsequences(PreflightContext const& ctx)
         return amount.native() ? amount.xrp() : beast::zero;
     };
 
-    return TxConsequences{ctx.tx.getTx(), calculateMaxXRPSpend(ctx.tx.getTx())};
+    return TxConsequences{
+        *ctx.tx.getTx(), calculateMaxXRPSpend(*ctx.tx.getTx())};
 }
 
 NotTEC
diff --git a/src/xrpld/app/tx/detail/CreateTicket.cpp b/src/xrpld/app/tx/detail/CreateTicket.cpp
@@ -31,7 +31,7 @@ TxConsequences
 CreateTicket::makeTxConsequences(PreflightContext const& ctx)
 {
     // Create TxConsequences identifying the number of sequences consumed.
-    return TxConsequences{ctx.tx.getTx(), ctx.tx[sfTicketCount]};
+    return TxConsequences{*ctx.tx.getTx(), ctx.tx[sfTicketCount]};
 }
 
 NotTEC
diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp
@@ -94,7 +94,7 @@ after(NetClock::time_point now, std::uint32_t mark)
 TxConsequences
 EscrowCreate::makeTxConsequences(PreflightContext const& ctx)
 {
-    return TxConsequences{ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};
+    return TxConsequences{*ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};
 }
 
 NotTEC
diff --git a/src/xrpld/app/tx/detail/PayChan.cpp b/src/xrpld/app/tx/detail/PayChan.cpp
@@ -168,7 +168,7 @@ closeChannel(
 TxConsequences
 PayChanCreate::makeTxConsequences(PreflightContext const& ctx)
 {
-    return TxConsequences{ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};
+    return TxConsequences{*ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};
 }
 
 NotTEC
@@ -310,7 +310,7 @@ PayChanCreate::doApply()
 TxConsequences
 PayChanFund::makeTxConsequences(PreflightContext const& ctx)
 {
-    return TxConsequences{ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};
+    return TxConsequences{*ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};
 }
 
 NotTEC
diff --git a/src/xrpld/app/tx/detail/Payment.cpp b/src/xrpld/app/tx/detail/Payment.cpp
@@ -42,7 +42,8 @@ Payment::makeTxConsequences(PreflightContext const& ctx)
         return maxAmount.native() ? maxAmount.xrp() : beast::zero;
     };
 
-    return TxConsequences{ctx.tx.getTx(), calculateMaxXRPSpend(ctx.tx.getTx())};
+    return TxConsequences{
+        *ctx.tx.getTx(), calculateMaxXRPSpend(*ctx.tx.getTx())};
 }
 
 STAmount
diff --git a/src/xrpld/app/tx/detail/SetAccount.cpp b/src/xrpld/app/tx/detail/SetAccount.cpp
@@ -53,7 +53,7 @@ SetAccount::makeTxConsequences(PreflightContext const& ctx)
     };
 
     return TxConsequences{
-        ctx.tx.getTx(), getTxConsequencesCategory(ctx.tx.getTx())};
+        *ctx.tx.getTx(), getTxConsequencesCategory(*ctx.tx.getTx())};
 }
 
 NotTEC
@@ -263,7 +263,7 @@ SetAccount::doApply()
     std::uint32_t const uFlagsIn = sle->getFieldU32(sfFlags);
     std::uint32_t uFlagsOut = uFlagsIn;
 
-    STTx const& tx{ctx_.tx.getTx()};
+    STTx const& tx{*ctx_.tx.getTx()};
     std::uint32_t const uSetFlag{tx.getFieldU32(sfSetFlag)};
     std::uint32_t const uClearFlag{tx.getFieldU32(sfClearFlag)};
 
diff --git a/src/xrpld/app/tx/detail/SetSignerList.cpp b/src/xrpld/app/tx/detail/SetSignerList.cpp
@@ -81,7 +81,7 @@ SetSignerList::preflight(PreflightContext const& ctx)
     if (auto const ret = preflight1(ctx); !isTesSuccess(ret))
         return ret;
 
-    auto const result = determineOperation(ctx.tx.getTx(), ctx.flags, ctx.j);
+    auto const result = determineOperation(*ctx.tx.getTx(), ctx.flags, ctx.j);
 
     if (std::get<0>(result) != tesSUCCESS)
         return std::get<0>(result);
@@ -136,7 +136,7 @@ void
 SetSignerList::preCompute()
 {
     // Get the quorum and operation info.
-    auto result = determineOperation(ctx_.tx.getTx(), view().flags(), j_);
+    auto result = determineOperation(*ctx_.tx.getTx(), view().flags(), j_);
     ASSERT(
         std::get<0>(result) == tesSUCCESS,
         "ripple::SetSignerList::preCompute : result is tesSUCCESS");
diff --git a/src/xrpld/app/tx/detail/Transactor.cpp b/src/xrpld/app/tx/detail/Transactor.cpp
diff --git a/src/xrpld/app/tx/detail/XChainBridge.cpp b/src/xrpld/app/tx/detail/XChainBridge.cpp
diff --git a/src/xrpld/app/tx/detail/applySteps.cpp b/src/xrpld/app/tx/detail/applySteps.cpp

Original file line number	Diff line number	Diff line change
`@@ -35,16 +35,16 @@ namespace ripple {`
`35`	`35`	`class STTxWr`
`36`	`36`	`{`
`37`	`37`	`private:`
`38`		`- STTx tx_; // Wrap an instance of STTx`
	`38`	`+ std::shared_ptr<STTx> tx_; // Wrap an instance of STTx`
`39`	`39`	`bool isDelegated_; // if the transaction is delegated by another account`
`40`	`40`
`41`	`41`	`public:`
`42`		`- explicit STTxWr(STTx tx, bool isDelegated)`
`43`		`- : tx_(tx), isDelegated_(isDelegated)`
	`42`	`+ explicit STTxWr(STTx const& tx, bool isDelegated)`
	`43`	`+ : tx_(std::make_shared<STTx>(tx)), isDelegated_(isDelegated)`
`44`	`44`	`{`
`45`	`45`	`}`
`46`	`46`
`47`		`- STTx`
	`47`	`+ std::shared_ptr<STTx>`
`48`	`48`	`getTx() const`
`49`	`49`	`{`
`50`	`50`	`return tx_;`
`@@ -60,9 +60,9 @@ class STTxWr`
`60`	`60`	`getAccountID(SField const& field) const`
`61`	`61`	`{`
`62`	`62`	`if (field == sfAccount)`
`63`		`- return tx_.isFieldPresent(sfOnBehalfOf) ? *tx_[~sfOnBehalfOf]`
`64`		`- : tx_[sfAccount];`
`65`		`- return tx_.getAccountID(field);`
	`63`	`+ return tx_->isFieldPresent(sfOnBehalfOf) ? (tx_)[~sfOnBehalfOf]`
	`64`	`+ : (*tx_)[sfAccount];`
	`65`	`+ return tx_->getAccountID(field);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`template <class T>`
`@@ -71,7 +71,7 @@ class STTxWr`
`71`	`71`	`typename T::value_type>::type`
`72`	`72`	`operator[](TypedField<T> const& f) const`
`73`	`73`	`{`
`74`		`- return tx_[f];`
	`74`	`+ return (*tx_)[f];`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`// When Type is SF_ACCOUNT and also field name is sfAccount, we need to`
`@@ -84,124 +84,124 @@ class STTxWr`
`84`	`84`	`operator[](TypedField<T> const& f) const`
`85`	`85`	`{`
`86`	`86`	`if (f == sfAccount)`
`87`		`- return tx_.isFieldPresent(sfOnBehalfOf) ? *tx_[~sfOnBehalfOf]`
`88`		`- : tx_[sfAccount];`
`89`		`- return tx_[f];`
	`87`	`+ return tx_->isFieldPresent(sfOnBehalfOf) ? (tx_)[~sfOnBehalfOf]`
	`88`	`+ : (*tx_)[sfAccount];`
	`89`	`+ return (*tx_)[f];`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`template <class T>`
`93`	`93`	`std::optional<std::decay_t<typename T::value_type>>`
`94`	`94`	`operator[](OptionaledField<T> const& of) const`
`95`	`95`	`{`
`96`		`- return tx_[of];`
	`96`	`+ return (*tx_)[of];`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`uint256`
`100`	`100`	`getTransactionID() const`
`101`	`101`	`{`
`102`		`- return tx_.getTransactionID();`
	`102`	`+ return tx_->getTransactionID();`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`TxType`
`106`	`106`	`getTxnType() const`
`107`	`107`	`{`
`108`		`- return tx_.getTxnType();`
	`108`	`+ return tx_->getTxnType();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`std::uint32_t`
`112`	`112`	`getFlags() const`
`113`	`113`	`{`
`114`		`- return tx_.getFlags();`
	`114`	`+ return tx_->getFlags();`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`bool`
`118`	`118`	`isFieldPresent(SField const& field) const`
`119`	`119`	`{`
`120`		`- return tx_.isFieldPresent(field);`
	`120`	`+ return tx_->isFieldPresent(field);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`Json::Value`
`124`	`124`	`getJson(JsonOptions options) const`
`125`	`125`	`{`
`126`		`- return tx_.getJson(options);`
	`126`	`+ return tx_->getJson(options);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`void`
`130`	`130`	`add(Serializer& s) const`
`131`	`131`	`{`
`132`		`- tx_.add(s);`
	`132`	`+ tx_->add(s);`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`unsigned char`
`136`	`136`	`getFieldU8(SField const& field) const`
`137`	`137`	`{`
`138`		`- return tx_.getFieldU8(field);`
	`138`	`+ return tx_->getFieldU8(field);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`std::uint32_t`
`142`	`142`	`getFieldU32(SField const& field) const`
`143`	`143`	`{`
`144`		`- return tx_.getFieldU32(field);`
	`144`	`+ return tx_->getFieldU32(field);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`uint256`
`148`	`148`	`getFieldH256(SField const& field) const`
`149`	`149`	`{`
`150`		`- return tx_.getFieldH256(field);`
	`150`	`+ return tx_->getFieldH256(field);`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`Blob`
`154`	`154`	`getFieldVL(SField const& field) const`
`155`	`155`	`{`
`156`		`- return tx_.getFieldVL(field);`
	`156`	`+ return tx_->getFieldVL(field);`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`STAmount const&`
`160`	`160`	`getFieldAmount(SField const& field) const`
`161`	`161`	`{`
`162`		`- return tx_.getFieldAmount(field);`
	`162`	`+ return tx_->getFieldAmount(field);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`STPathSet const&`
`166`	`166`	`getFieldPathSet(SField const& field) const`
`167`	`167`	`{`
`168`		`- return tx_.getFieldPathSet(field);`
	`168`	`+ return tx_->getFieldPathSet(field);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`const STVector256&`
`172`	`172`	`getFieldV256(SField const& field) const`
`173`	`173`	`{`
`174`		`- return tx_.getFieldV256(field);`
	`174`	`+ return tx_->getFieldV256(field);`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`const STArray&`
`178`	`178`	`getFieldArray(SField const& field) const`
`179`	`179`	`{`
`180`		`- return tx_.getFieldArray(field);`
	`180`	`+ return tx_->getFieldArray(field);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`Blob`
`184`	`184`	`getSigningPubKey() const`
`185`	`185`	`{`
`186`		`- return tx_.getSigningPubKey();`
	`186`	`+ return tx_->getSigningPubKey();`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`Blob`
`190`	`190`	`getSignature() const`
`191`	`191`	`{`
`192`		`- return tx_.getSignature();`
	`192`	`+ return tx_->getSignature();`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`bool`
`196`	`196`	`isFlag(std::uint32_t f) const`
`197`	`197`	`{`
`198`		`- return tx_.isFlag(f);`
	`198`	`+ return tx_->isFlag(f);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`SeqProxy`
`202`	`202`	`getSeqProxy() const`
`203`	`203`	`{`
`204`		`- return tx_.getSeqProxy();`
	`204`	`+ return tx_->getSeqProxy();`
`205`	`205`	`}`
`206`	`206`	`};`
`207`	`207`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ ApplyContext::discard()`
`58`	`58`	`void`
`59`	`59`	`ApplyContext::apply(TER ter)`
`60`	`60`	`{`
`61`		`- view_->apply(base_, tx.getTx(), ter, journal);`
	`61`	`+ view_->apply(base_, *tx.getTx(), ter, journal);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`std::size_t`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ CreateOffer::makeTxConsequences(PreflightContext const& ctx)`
`36`	`36`	`return amount.native() ? amount.xrp() : beast::zero;`
`37`	`37`	`};`
`38`	`38`
`39`		`- return TxConsequences{ctx.tx.getTx(), calculateMaxXRPSpend(ctx.tx.getTx())};`
	`39`	`+ return TxConsequences{`
	`40`	`+ ctx.tx.getTx(), calculateMaxXRPSpend(ctx.tx.getTx())};`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`NotTEC`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ TxConsequences`
`31`	`31`	`CreateTicket::makeTxConsequences(PreflightContext const& ctx)`
`32`	`32`	`{`
`33`	`33`	`// Create TxConsequences identifying the number of sequences consumed.`
`34`		`- return TxConsequences{ctx.tx.getTx(), ctx.tx[sfTicketCount]};`
	`34`	`+ return TxConsequences{*ctx.tx.getTx(), ctx.tx[sfTicketCount]};`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`NotTEC`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ after(NetClock::time_point now, std::uint32_t mark)`
`94`	`94`	`TxConsequences`
`95`	`95`	`EscrowCreate::makeTxConsequences(PreflightContext const& ctx)`
`96`	`96`	`{`
`97`		`- return TxConsequences{ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};`
	`97`	`+ return TxConsequences{*ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`NotTEC`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ closeChannel(`
`168`	`168`	`TxConsequences`
`169`	`169`	`PayChanCreate::makeTxConsequences(PreflightContext const& ctx)`
`170`	`170`	`{`
`171`		`- return TxConsequences{ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};`
	`171`	`+ return TxConsequences{*ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`NotTEC`
`@@ -310,7 +310,7 @@ PayChanCreate::doApply()`
`310`	`310`	`TxConsequences`
`311`	`311`	`PayChanFund::makeTxConsequences(PreflightContext const& ctx)`
`312`	`312`	`{`
`313`		`- return TxConsequences{ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};`
	`313`	`+ return TxConsequences{*ctx.tx.getTx(), ctx.tx[sfAmount].xrp()};`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`NotTEC`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ Payment::makeTxConsequences(PreflightContext const& ctx)`
`42`	`42`	`return maxAmount.native() ? maxAmount.xrp() : beast::zero;`
`43`	`43`	`};`
`44`	`44`
`45`		`- return TxConsequences{ctx.tx.getTx(), calculateMaxXRPSpend(ctx.tx.getTx())};`
	`45`	`+ return TxConsequences{`
	`46`	`+ ctx.tx.getTx(), calculateMaxXRPSpend(ctx.tx.getTx())};`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`STAmount`