-
Notifications
You must be signed in to change notification settings - Fork 28
feat: Manual Cooperative Redeem #555
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.
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
base: master
Are you sure you want to change the base?
Conversation
…velyRedeemable state to Bob state machine
… cooperative redeem key
src-gui/src/renderer/components/pages/swap/swap/done/BitcoinPunishedPage.tsx
Show resolved
Hide resolved
src-gui/src/renderer/components/pages/swap/swap/done/BitcoinPunishedPage.tsx
Outdated
Show resolved
Hide resolved
src-gui/src/renderer/components/pages/swap/swap/done/BitcoinPunishedPage.tsx
Outdated
Show resolved
Hide resolved
binarybaron
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some comments
- rename rpc method to avoid abbreviation - improve comments/naming - check Alice finalized tx_punish before revealing cooperative redeem key - gui: only resume swap if cooperative redeem worked.
…ection reset by peer)
manual cooperative redeem
|
@Einliterflasche You can test this on our testnet VPS. Just change the |
|
bugbot run |
|
Skipping Bugbot: Bugbot is disabled for this repository |
|
bugbot run |
| - package: swap | ||
| test_name: manual_cooperative_redeem | ||
| - package: swap | ||
| test_name: manual_cooperative_redeem_malicious_key.rs |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: Test Name Incorrectly Includes File Extension
The test_name manual_cooperative_redeem_malicious_key.rs in the CI workflow incorrectly includes the .rs file extension. Test names typically reference the test function, not the filename, and this inconsistency may prevent the CI from running the test.
| ) | ||
| .into_json_rpc_error(); | ||
| } | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR adds the functionality for manual cooperative redeem between maker and taker:
cooperative-redeem --swap-id <swap-id>command toasb-controllerBob::BtcRedeemedwhen Bob gets the correct keyNote
Implements manual cooperative redeem after punish across core, RPC/CLI, and GUI, with key validation, DB migration, and tests.
s_aagainstS_a_moneroand transition toBob::BtcRedeemedupon success.State4/State6) to carryS_a_monero; addPrivateViewKey::from_spend_key.cooperative_redeem_info(swap_id)endpoint; server returnss_a,lock_tx_id,lock_tx_keywhen safe.cooperative-redeem-key --swap-idcommand.manual_cooperative_redeemcommand and request types; wire through context.S_a_monerofor Bob states to enable validation.manual_cooperative_redeemand malicious key rejection; include in CI matrix.monero-oxide,swap-serdeusage; minor logging/utility changes; justfile targets updated.Written by Cursor Bugbot for commit fa23dfa. This will update automatically on new commits. Configure here.