Skip to content
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

Jump to bottom

fix(legacy-swap): taker failed spend maker payment marked as failed #2199

Merged
merged 31 commits into from
Oct 4, 2024
Merged

fix(legacy-swap): taker failed spend maker payment marked as failed #2199

merged 31 commits into from
Oct 4, 2024

Commits on Aug 23, 2024

  1. WIP: new fn confirm_maker_payment_spend, Taker command and events

    @laruh
    laruh committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    1461212 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Merge remote-tracking branch 'origin/dev' into taker-failed-swaps-mar… 

    …ked-successful
    @laruh
    laruh committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    31292be View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. update events in recreate_taker_swap_taker_expected.json

    @laruh
    laruh committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    0ede740 View commit details
    Browse the repository at this point in the history

  2. update events in recreate_taker_swap_taker_payment_wait_confirm_faile… 

    …d_taker_expected.json
    @laruh
    laruh committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    9c6c892 View commit details
    Browse the repository at this point in the history

  3. update events in for_tests.rs consts, taker_swap.rs mod taker_swap_te… 

    …sts, iris_nimda_rick_taker_swap.json
    @laruh
    laruh committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    b716806 View commit details
    Browse the repository at this point in the history

  4. add "MakerPaymentSpendConfirmed" to TAKER_ACTUAL_EVENTS_TAKER_SPENDS_… 

    …MAKER_PAYMENT
    @laruh
    laruh committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    5c47ef0 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Merge remote-tracking branch 'origin/dev' into taker-failed-swaps-mar… 

    …ked-successful
    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    3117c5f View commit details
    Browse the repository at this point in the history

  2. provide "MakerPaymentSpendConfirmed" success event in more test jsons

    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    eca0bda View commit details
    Browse the repository at this point in the history

  3. log events

    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    0e9a807 View commit details
    Browse the repository at this point in the history

  4. TakerSwapEvent::MakerPaymentSpentByWatcher(_) => Some(TakerSwapComman… 

    …d::ConfirmMakerPaymentSpend)
    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    eb16235 View commit details
    Browse the repository at this point in the history

  5. in taker_restart.rs provide TakerSwapCommand::ConfirmMakerPaymentSpen… 

    …d => Ok(command),
    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    1a1a775 View commit details
    Browse the repository at this point in the history

  6. move TakerSwapEvent::MakerPaymentSpendConfirmFailed in MakerSavedEvent

    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    3af96a5 View commit details
    Browse the repository at this point in the history

  7. use TakerSwapCommand::SpendMakerPayment => check_maker_payment_spend_… 

    …and_add_event(ctx, swap, saved).await in taker restart
    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    1c3c935 View commit details
    Browse the repository at this point in the history

  8. return TakerSwapEvent::MakerPaymentSpentByWatcher(_) => Some(TakerSwa… 

    …pCommand::Finish),
    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    7829b4b View commit details
    Browse the repository at this point in the history

  9. add "MakerPaymentSpendConfirmed" to TAKER_USING_WATCHERS_SUCCESS_EVENTS

    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    075de97 View commit details
    Browse the repository at this point in the history

  10. add "MakerPaymentSpendConfirmed" to TAKER_USING_WATCHERS_SUCCESS_EVEN… 

    …TS in for_tests.rs
    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    cc7c963 View commit details
    Browse the repository at this point in the history

  11. remove logs

    @laruh
    laruh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    69ed68e View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. self.r().data.maker_payment_requires_nota.unwrap_or(false)

    @laruh
    laruh committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    b2446b9 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. provide number of confirmations in wait_for_confirmations

    @laruh
    laruh committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    2c119be View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into taker-failed-swaps-mar… 

    …ked-successful
    @laruh
    laruh committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    b9ba150 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. provide requires_nota:false in confirm_maker_payment_spend

    @laruh
    laruh committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    165ddfe View commit details
    Browse the repository at this point in the history

  2. review: make doc com of wait_for_confirmations clearer

    @laruh
    laruh committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    b50b2a3 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/dev' into taker-failed-swaps-mar… 

    …ked-successful
    @laruh
    laruh committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    6fa527a View commit details
    Browse the repository at this point in the history

  4. Revert "provide number of confirmations in wait_for_confirmations" 

    This reverts commit 2c119be
    @laruh
    laruh committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    0073fe8 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. review: for old saved swaps check "TakerSwapEvent::MakerPaymentSpent"… 

    … in is_recoverable function
    @laruh
    laruh committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    aed8d4c View commit details
    Browse the repository at this point in the history

  2. review: add "MakerPaymentSpendConfirmed" event in const FINISHED_TAKE… 

    …R_SWAP
    @laruh
    laruh committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    ed91569 View commit details
    Browse the repository at this point in the history

  3. review: cover ConfirmMakerPaymentSpend for MakerPaymentSpentByWatcher

    @laruh
    laruh committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    0661ee2 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. review: add SAVED_SWAP_V for new version fields in TakerSavedSwap and… 

    … MakerSavedSwap
    @laruh
    laruh committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    5ce137f View commit details
    Browse the repository at this point in the history

  2. update confirmation comments in confirm_maker_payment_spend and in co… 

    …nfirm_taker_payment_spend
    @laruh
    laruh committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    f93fcde View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Revert "review: add SAVED_SWAP_V for new version fields in TakerSaved… 

    …Swap and MakerSavedSwap"

This reverts commit 5ce137f.
    @laruh
    laruh committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    51c58cb View commit details
    Browse the repository at this point in the history

  2. review: simplify is_recoverable

    @laruh
    laruh committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    b33380a View commit details
    Browse the repository at this point in the history