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.

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

fix(legacy-swap): check for confirmations on recover taker #2242

Merged
merged 1 commit into from
Nov 1, 2024

Conversation

shamardy
Copy link
Collaborator

This PR fixes recover funds for taker when the swap was marked as unsuccessful due to the maker payment spend transaction not being confirmed. It also uses the required confirmations from coin config for taker/maker payment spend instead of using 1 confirmation max. This is because some chains require more than 1 confirmation for finality, e.g. Polygon.

…d use the confirmations from coin config for the maker/taker payment spend confirmations
@shamardy shamardy added the in progress Changes will be made from the author label Oct 15, 2024
@shamardy shamardy requested review from cipig, laruh and dimxy October 15, 2024 06:37
@shamardy shamardy added under review and removed in progress Changes will be made from the author labels Oct 15, 2024
Copy link
Collaborator

@dimxy dimxy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cipig
Copy link
Member

cipig commented Oct 28, 2024

hard to test this, since it needs a chain rollback
either merge it as is... or please merge latest dev into this branch, then i use this on Desktop and wait for the next chain rollback on PLG20
i see that this branch is not on https://sdk.devbuilds.komodo.earth/ any more

@shamardy shamardy merged commit 91d982b into dev Nov 1, 2024
23 of 26 checks passed
@shamardy shamardy deleted the fix-recover-taker branch November 1, 2024 15:35
dimxy added a commit that referenced this pull request Nov 2, 2024
* dev:
  fix(legacy-swap): check for confirmations on recover taker (#2242)
  fix(legacy-swap): remove the need for takers to confirm their payment (#2249)
  refactor(P2P): types and modules (#2256)
  fix(evm): correctly display eth addr in iguana v2 activation result (#2254)
  feat(utxo): prioritize electrum connections (#1966)
  refactor(SwapOps): make all methods async (#2251)
  refactor(SwapOps): make `send_maker_payment` async (#2250)
  remove old p2p implementation (#2248)
dimxy added a commit that referenced this pull request Nov 7, 2024
* dev:
  fix(nft): add token_id field to the tx history primary key, fix balance (#2209)
  feat(cosmos): support IBC types in tx history implementation (#2245)
  fix(hd-wallet): use `CoinBalanceMap` for UTXO and QTUM (#2259)
  fix(tests): add more sepolia endpoints in tests (#2262)
  fix(legacy-swap): check for confirmations on recover taker (#2242)
  fix(legacy-swap): remove the need for takers to confirm their payment (#2249)
  refactor(P2P): types and modules (#2256)
  fix(evm): correctly display eth addr in iguana v2 activation result (#2254)
  feat(utxo): prioritize electrum connections (#1966)
  refactor(SwapOps): make all methods async (#2251)
  refactor(SwapOps): make `send_maker_payment` async (#2250)
  remove old p2p implementation (#2248)
dimxy added a commit that referenced this pull request Nov 11, 2024
* dev:
  fix(foot-shooting): remove leftover code that panics via RPC (#2270)
  refactor(MarketCoinOps): make `wait_for_htlc_tx_spend` async (#2265)
  feat(eth-swap): maker tpu v2 implementation (#2211)
  fix(nft): add token_id field to the tx history primary key, fix balance (#2209)
  feat(cosmos): support IBC types in tx history implementation (#2245)
  fix(hd-wallet): use `CoinBalanceMap` for UTXO and QTUM (#2259)
  fix(tests): add more sepolia endpoints in tests (#2262)
  fix(legacy-swap): check for confirmations on recover taker (#2242)
  fix(legacy-swap): remove the need for takers to confirm their payment (#2249)
  refactor(P2P): types and modules (#2256)
  fix(evm): correctly display eth addr in iguana v2 activation result (#2254)
  feat(utxo): prioritize electrum connections (#1966)
  refactor(SwapOps): make all methods async (#2251)
  refactor(SwapOps): make `send_maker_payment` async (#2250)
  remove old p2p implementation (#2248)
  feat(cosmos-offline-tests): prepare IBC channels inside the container  (#2246)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants