Sender Pending Fallback state#1557
Open
arminsabouri wants to merge 3 commits into
Open
Conversation
arminsabouri
force-pushed
the
sender-cancel-state
branch
2 times, most recently
from
7cf2e7c to
d3dac67
Compare
Collaborator
Coverage Report for CI Build 26115328632Coverage decreased (-0.09%) to 85.211%Details
Uncovered Changes
Coverage RegressionsNo coverage regressions found. Coverage Stats
💛 - Coveralls |
arminsabouri
force-pushed
the
sender-cancel-state
branch
from
d3dac67 to
cefae94
Compare
arminsabouri
force-pushed
the
sender-cancel-state
branch
4 times, most recently
from
38ef7b3 to
402848a
Compare
Contributor
|
concept ACK just like #1558 |
arminsabouri
force-pushed
the
sender-cancel-state
branch
from
402848a to
b6040c7
Compare
arminsabouri
commented
May 19, 2026
| /// Indicates that the fallback transaction has been broadcast and the session is complete. | ||
| pub fn broadcasted( | ||
| &self, | ||
| ) -> MaybeSuccessTransition<SessionEvent, (), std::convert::Infallible> { |
Collaborator
Author
There was a problem hiding this comment.
std::convert::Infallible bc this method can never fail due to a API error.
Collaborator
Author
There was a problem hiding this comment.
TerminalTransition is more appropriate
If application manually cancels the assumption is they will not attempt to resume that session again. The session is marked closed. The cancel type leaves the session open and the session can only be closed once the user confirms they broadcasted the fallback tx -- or took an equivalent action.
Introduce a `cancel` command for v2 sender sessions. The command transitions the session to `PendingFallback`.
`cancel` only records the cancellation event and prints a message directing the user to run `fallback` to broadcast. `fallback` handles the broadcast. The e2e test is updated to exercise both steps in sequence, asserting the fallback is absent from the mempool after `cancel` and present after `fallback`.
arminsabouri
force-pushed
the
sender-cancel-state
branch
from
b6040c7 to
c57d338
Compare
xstoicunicornx
approved these changes
May 20, 2026
Collaborator
xstoicunicornx
left a comment
xstoicunicornx
left a comment
There was a problem hiding this comment.
utACK c57d338
Somewhat strongly held nit: changing from SessionOutcome::Cancel to SessionOutcome::Aborted makes it more confusing/less intuitive. It gives two different terms that refer to the same state transition path. Was there a reason you felt that SessionOutcome::Aborted was better? I do think Cancelled is better than Cancel though.
Other than my nits and the comment that seems like it can be removed, implementation looks good and all tests pass.
Comment on lines
+204
to
+215
|
|
||
| // impl<S> From<payjoin::persist::PersistedError<std::convert::Infallible, S>> for SenderPersistedError | ||
| // where | ||
| // S: std::error::Error + Send + Sync + 'static, | ||
| // { | ||
| // fn from(err: payjoin::persist::PersistedError<std::convert::Infallible, S>) -> Self { | ||
| // if let Some(storage_err) = err.storage_error() { | ||
| // return SenderPersistedError::from(ImplementationError::new(storage_err)); | ||
| // } | ||
| // SenderPersistedError::Unexpected | ||
| // } | ||
| // } |
Collaborator
There was a problem hiding this comment.
Suggested change
| // impl<S> From<payjoin::persist::PersistedError<std::convert::Infallible, S>> for SenderPersistedError | |
| // where | |
| // S: std::error::Error + Send + Sync + 'static, | |
| // { | |
| // fn from(err: payjoin::persist::PersistedError<std::convert::Infallible, S>) -> Self { | |
| // if let Some(storage_err) = err.storage_error() { | |
| // return SenderPersistedError::from(ImplementationError::new(storage_err)); | |
| // } | |
| // SenderPersistedError::Unexpected | |
| // } | |
| // } |
Can this be removed?
Comment on lines
+197
to
+198
| SendSession::PendingFallback(inner) => | ||
| Self::Cancelled { inner: Arc::new(inner.into()) }, |
Collaborator
There was a problem hiding this comment.
Suggested change
| SendSession::PendingFallback(inner) => | |
| Self::Cancelled { inner: Arc::new(inner.into()) }, | |
| SendSession::PendingFallback(inner) => | |
| Self::PendingFallback { inner: Arc::new(inner.into()) }, |
Nit: Why not follow the base code naming conventions rather than creating anti-patterns?
| "State should be Closed after cancel", | ||
| "Cancelled", | ||
| "State should be Cancelled after cancel", | ||
| ); |
Collaborator
There was a problem hiding this comment.
const cancelled = pendingFallback
.broadcasted()
.save(senderPersister);
const result = payjoin.replaySenderEventLog(senderPersister);
const state = result.state();
assert.strictEqual(
state.tag,
"Closed",
"State should be Closed after cancel",
);Nit: Maybe keep Closed as the final state so that it tests broadcasted() and continues to test that send session is closed out? Would apply to rest of unit tests as well.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Implementing @spacebear21 's idea from #1542 (comment)
for just the sender.
Recevier side is implemented here: #1558
Pull Request Checklist
Please confirm the following before requesting review:
AI
in the body of this PR.
Claude made the updates to the payjoin-cli