fixPayChanV1

src/ripple/app/tx/impl/PayChan.cpp

@@ -112,6 +112,18 @@ namespace ripple {
 
 //------------------------------------------------------------------------------
 
+/** Has the specified time passed?
+
+    @param now  the current time
+    @param mark the cutoff point
+    @return true if \a now refers to a time strictly after \a mark, else false.
+*/
+static inline bool
+after(NetClock::time_point now, std::uint32_t mark)
+{
+    return now.time_since_epoch().count() > mark;
+}
+
 static TER
 closeChannel(
     std::shared_ptr<SLE> const& slep,
@@ -271,6 +283,13 @@ PayChanCreate::doApply()
     (*slep)[~sfSourceTag] = ctx_.tx[~sfSourceTag];
     (*slep)[~sfDestinationTag] = ctx_.tx[~sfDestinationTag];
 
+    if (ctx_.view().rules().enabled(fixPayChanV1))
+    {
+        auto const closeTime = ctx_.view().info().parentCloseTime;
+        if (ctx_.tx[~sfCancelAfter] && after(closeTime, ctx_.tx[sfCancelAfter]))
+            return tecEXPIRED;
+    }
+
     ctx_.view().insert(slep);
 
     // Add PayChan to owner directory

src/ripple/protocol/Feature.h

@@ -74,7 +74,7 @@ namespace detail {
 // Feature.cpp. Because it's only used to reserve storage, and determine how
 // large to make the FeatureBitset, it MAY be larger. It MUST NOT be less than
 // the actual number of amendments. A LogicError on startup will verify this.
-static constexpr std::size_t numFeatures = 62;
+static constexpr std::size_t numFeatures = 63;
 
 /** Amendments that this server supports and the default voting behavior.
    Whether they are enabled depends on the Rules defined in the validated
@@ -349,6 +349,7 @@ extern uint256 const fixNFTokenRemint;
 extern uint256 const fixReducedOffersV1;
 extern uint256 const featureClawback;
 extern uint256 const featureXChainBridge;
+extern uint256 const fixPayChanV1;
 
 }  // namespace ripple
 

src/ripple/protocol/impl/Feature.cpp

@@ -456,6 +456,7 @@ REGISTER_FIX    (fixReducedOffersV1,            Supported::yes, VoteBehavior::De
 REGISTER_FEATURE(Clawback,                      Supported::yes, VoteBehavior::DefaultNo);
 REGISTER_FEATURE(AMM,                           Supported::yes, VoteBehavior::DefaultNo);
 REGISTER_FEATURE(XChainBridge,                  Supported::yes, VoteBehavior::DefaultNo);
+REGISTER_FIX    (fixPayChanV1,                  Supported::yes, VoteBehavior::DefaultNo);
 
 // The following amendments are obsolete, but must remain supported
 // because they could potentially get enabled.

src/test/app/PayChan_test.cpp

@@ -401,6 +401,52 @@ struct PayChan_test : public beast::unit_test::suite
             BEAST_EXPECT(!channelExists(*env.current(), chan));
             BEAST_EXPECT(env.balance(alice) == preAlice + channelFunds);
         }
+        // fixPayChanV1
+        // CancelAfter should be greater than close time
+        {
+            for (bool const withFixPayChanV1 : {true, false})
+            {
+                auto const amend =
+                    withFixPayChanV1 ? features : features - fixPayChanV1;
+                Env env{*this, amend};
+                env.fund(XRP(10000), alice, bob);
+                env.close();
+
+                auto const pk = alice.pk();
+                auto const settleDelay = 100s;
+                auto const channelFunds = XRP(1000);
+                NetClock::time_point const cancelAfter =
+                    env.current()->info().parentCloseTime - 1s;
+                auto const txResult =
+                    withFixPayChanV1 ? ter(tecEXPIRED) : ter(tesSUCCESS);
+                env(create(
+                        alice, bob, channelFunds, settleDelay, pk, cancelAfter),
+                    txResult);
+            }
+        }
+        // fixPayChanV1
+        // CancelAfter can be equal to the close time
+        {
+            for (bool const withFixPayChanV1 : {true, false})
+            {
+                auto const amend =
+                    withFixPayChanV1 ? features : features - fixPayChanV1;
+                Env env{*this, amend};
+                env.fund(XRP(10000), alice, bob);
+                env.close();
+
+                auto const pk = alice.pk();
+                auto const settleDelay = 100s;
+                auto const channelFunds = XRP(1000);
+                NetClock::time_point const cancelAfter =
+                    env.current()->info().parentCloseTime;
+                auto const txResult =
+                    withFixPayChanV1 ? ter(tesSUCCESS) : ter(tesSUCCESS);
+                env(create(
+                        alice, bob, channelFunds, settleDelay, pk, cancelAfter),
+                    txResult);
+            }
+        }
     }
 
     void