forked from jl777/SuperNET
-
Notifications
You must be signed in to change notification settings - Fork 101
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
feat(swap): implement 0 dexfee for kmd trading pairs #2323
Open
borngraced
wants to merge
9
commits into
dev
Choose a base branch
from
0-kmd-dex-fee
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
9059f93
impl zero dex fee for KMD
borngraced 450ced6
fix swap unit test
borngraced 0cc613a
fix docker test and dissallow sending dex fee
borngraced 49f08ac
fix gen_taker_payment_spend_preimage
borngraced 1a8539a
check for zero dex fee in other protocol
borngraced dc45a35
eth and tendermint
borngraced f62a0de
check for KMD ticker in swap_v2
borngraced 2d6ae32
save dev state
borngraced a6cb780
update taker fee validated log info
borngraced File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -3624,6 +3624,8 @@ pub enum DexFee { | |||||||||
fee_amount: MmNumber, | ||||||||||
burn_amount: MmNumber, | ||||||||||
}, | ||||||||||
/// Zero dex fee, exclusive to KMD only. | ||||||||||
Zero, | ||||||||||
} | ||||||||||
|
||||||||||
impl DexFee { | ||||||||||
|
@@ -3640,13 +3642,14 @@ impl DexFee { | |||||||||
match self { | ||||||||||
DexFee::Standard(t) => t.clone(), | ||||||||||
DexFee::WithBurn { fee_amount, .. } => fee_amount.clone(), | ||||||||||
DexFee::Zero => MmNumber::default(), | ||||||||||
} | ||||||||||
} | ||||||||||
|
||||||||||
/// Gets the burn amount associated with the dex fee, if applicable. | ||||||||||
pub fn burn_amount(&self) -> Option<MmNumber> { | ||||||||||
match self { | ||||||||||
DexFee::Standard(_) => None, | ||||||||||
DexFee::Standard(_) | DexFee::Zero => None, | ||||||||||
DexFee::WithBurn { burn_amount, .. } => Some(burn_amount.clone()), | ||||||||||
} | ||||||||||
} | ||||||||||
|
@@ -3659,6 +3662,7 @@ impl DexFee { | |||||||||
fee_amount, | ||||||||||
burn_amount, | ||||||||||
} => fee_amount + burn_amount, | ||||||||||
DexFee::Zero => MmNumber::default(), | ||||||||||
} | ||||||||||
} | ||||||||||
|
||||||||||
|
@@ -3676,6 +3680,9 @@ impl DexFee { | |||||||||
Ok(None) | ||||||||||
} | ||||||||||
} | ||||||||||
|
||||||||||
/// Check and return true if DexFee is not required to trade otherwise return false. | ||||||||||
pub fn no_fee(&self) -> bool { matches!(self, Self::Zero) } | ||||||||||
Comment on lines
+3684
to
+3685
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||
} | ||||||||||
|
||||||||||
pub struct CoinsContext { | ||||||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
You can use
platform_ticker
instead. I am not sure if you intentionally drop the nft support, but if we want to do that we need to add a if check before usingplatform_ticker
.