Skip to content

[DONT MERGE] Temp Fix: Modify the cancellation logic #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marvinkruse wants to merge 3 commits into
base: dev-combined
Choose a base branch
from
Open

[DONT MERGE] Temp Fix: Modify the cancellation logic #767

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5262ea7
Temp Fix: qacc payout issue
marvinkruse Jun 22, 2025
e152a55
Temp Fix: Allow admin to run cancelRunningOrders
marvinkruse Jun 22, 2025
63dbbd2
Fix: Formatting
marvinkruse Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions src/modules/paymentProcessor/PP_Streaming_v1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,9 @@ contract PP_Streaming_v1 is Module_v1, IPP_Streaming_v1 {
/// @inheritdoc IPaymentProcessor_v1
function cancelRunningPayments(IERC20PaymentClientBase_v1 client)
external
onlyModule
validClient(address(client))
// onlyModule
// validClient(address(client))
onlyOrchestratorAdmin
{
_cancelRunningOrders(address(client));
}
Expand Down Expand Up @@ -540,17 +541,29 @@ contract PP_Streaming_v1 is Module_v1, IPP_Streaming_v1 {
uint streamId;
for (index; index < streamIdsArrayLength;) {
streamId = streamIdsArray[index];
_claimForSpecificStream(client, paymentReceiver, streamId);

// -------------------------------------------------------
// Note: Temporary Fix to prevent claims of faulty streams
// _claimForSpecificStream(client, paymentReceiver, streamId);
// -------------------------------------------------------

// If the paymentOrder being removed was already past its duration, then it would have been removed
// in the earlier _claimForSpecificStream call.
// Otherwise, we would remove that paymentOrder in the following lines.
if (
block.timestamp
< endForSpecificStream(client, paymentReceiver, streamId)
) {
_afterClaimCleanup(client, paymentReceiver, streamId);
}
// -------------------------------------------------------
// Note: Temporary Fix to prevent claims of faulty streams
// if (
// block.timestamp
// < endForSpecificStream(client, paymentReceiver, streamId)
// ) {
// _afterClaimCleanup(client, paymentReceiver, streamId);
// }
// -------------------------------------------------------

// Note: Temporary Fix to cancel all of the faulty streams
// -------------------------------------------------------
_afterClaimCleanup(client, paymentReceiver, streamId);
// -------------------------------------------------------

unchecked {
++index;
Expand Down