Verify and claim swap if not verifiable in swap loop #681
Conversation
lib/core/src/receive_swap.rs
Outdated
| .map(|o| o.value)?; | ||
| let expected_lockup_amount_sat = | ||
| receive_swap.receiver_amount_sat + receive_swap.claim_fees_sat; | ||
| if expected_lockup_amount_sat != lockup_amount_sat { |
There was a problem hiding this comment.
Should be more tolerant here: expected_lockup_amount_sat <= lockup_amount_sat
lib/core/src/recover/model.rs
Outdated
| Ok(ReceiveSwapImmutableData { | ||
| swap_id, | ||
| swap_timestamp: swap.created_at, | ||
| timeout_block_height: create_response.timeout_block_height, | ||
| blinding_key, |
There was a problem hiding this comment.
Not for the scope of this PR of course, just adding a note here that perhaps we consider to set the swap object itself instead of keep adding fields.
lib/core/src/recover/recoverer.rs
Outdated
| "Failed to verify lockup amount for Receive Swap {}: {} sat vs {} sat", | ||
| swap_id, expected_lockup_amount_sat, lockup_amount_sat | ||
| ); | ||
| recovered_data.lockup_tx_id = None; |
There was a problem hiding this comment.
Do you think we can simplify the recoverer by not making it responsible for validating the lockup amount?
If we prevent claiming the wrong amount isn't that enough?
There was a problem hiding this comment.
The swap/payment would be set to Pending if we don't. Especially for non-local swaps
There was a problem hiding this comment.
Right but since this is an edge case (where the swOpers cheats) doesn't it worth the simplicity? Worst case the payment stays pending untill expiration.
There was a problem hiding this comment.
Simplified 0cb9ca1
dangeross
force-pushed
the
savage-receive-claim-check
branch
from
c377e36 to
0cb9ca1
Compare
There was a problem hiding this comment.
Did you mean to commit this file?
This PR:
Fixes #675
Testing Notes: