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 the balance checking at the start of swap #812

Merged
merged 4 commits into from
Feb 8, 2021
Merged

Fix the balance checking at the start of swap #812

merged 4 commits into from
Feb 8, 2021

Conversation

sergeyboyko0791
Copy link

  • Take into account the fee approximation stage to prevent unexpected commission increase
  • Add txfee_volatility_percent into UTXO coin config

@sergeyboyko0791
Add volume_fraction, volume_rat and taker_fee_fraction, taker_fee_rat…
29642ed 
… into trade_preimage response
@sergeyboyko0791
Take into account the fee approximation stage on get trade fee
2fbda73 
* Add FeeApproxStage
* Add txfee_volatility_percent into coins config
@sergeyboyko0791
Merge branch 'mm2.1' into fix-trade-preimage
d2645f8 
# Conflicts:
#	mm2src/lp_swap/maker_swap.rs
#	mm2src/lp_swap/taker_swap.rs
@sergeyboyko0791
Minor changes
ba362f7
artemii235
artemii235 approved these changes Feb 8, 2021
View reviewed changes
Copy link
Member

@artemii235 artemii235 left a comment

Choose a reason for hiding this comment

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

Looks great to me, thanks!

@artemii235 artemii235 merged commit 0734e7a into mm2.1 Feb 8, 2021
@artemii235 artemii235 deleted the fix-trade-preimage branch February 8, 2021 07:02
@sergeyboyko0791 sergeyboyko0791 mentioned this pull request Feb 9, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artemii235 artemii235 artemii235 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sergeyboyko0791 @artemii235