-
Notifications
You must be signed in to change notification settings - Fork 192
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: foxwifhat discount #8663
Merged
Merged
feat: foxwifhat discount #8663
Conversation
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
bc47046
to
f44a4a2
Compare
gomesalexandre
approved these changes
Jan 27, 2025
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.
Tested locally against develop (right):
- 11,000 FWH held, moderate-size trade right above the fees curve - FWH discount higher than regular FOX fees curve
![image](https://private-user-images.githubusercontent.com/17035424/406994181-6827b060-00ed-4a95-af01-79eb151a690e.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4MjY3MjksIm5iZiI6MTczODgyNjQyOSwicGF0aCI6Ii8xNzAzNTQyNC80MDY5OTQxODEtNjgyN2IwNjAtMDBlZC00YTk1LWFmMDEtNzllYjE1MWE2OTBlLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDA3MjAyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTIwYjlmMDc4MWY0MTM2MTNiMTVjNmYxZjkxM2E5NzZlOThjZmUyOGE3NWZiNzNmMjJjYmFmNmEwNGNiNGNlZWYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.Vlud7NSK9dBjxz9ZnIfcF9Bl4sLdq-jWBn6eKkH_BsI)
- 11,000 FWH held, smaller trade right undeer the fees curve - no fees regardless of FWH holdings
![image](https://private-user-images.githubusercontent.com/17035424/406994681-15ddc721-a60d-426c-92ed-c0420d6b081e.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4MjY3MjksIm5iZiI6MTczODgyNjQyOSwicGF0aCI6Ii8xNzAzNTQyNC80MDY5OTQ2ODEtMTVkZGM3MjEtYTYwZC00MjZjLTkyZWQtYzA0MjBkNmIwODFlLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDA3MjAyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTEyYmQzOTE5YmY1ZTI3NzFkNzkxZmI0NTg2ZDMxNzI5ZGEwNTEzZjU1NzJjZjU4ZTQ1NGU1YjU0NGYzZGFjNTUmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.x-r385CenV6Ul4VUSHRb5AbWfXTAVymQc2VBTVxvR7w)
- No wallet, no discount
![image](https://private-user-images.githubusercontent.com/17035424/406995506-f033068f-0bea-40eb-a254-46ad4cfa15dc.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4MjY3MjksIm5iZiI6MTczODgyNjQyOSwicGF0aCI6Ii8xNzAzNTQyNC80MDY5OTU1MDYtZjAzMzA2OGYtMGJlYS00MGViLWEyNTQtNDZhZDRjZmExNWRjLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDA3MjAyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTlhNWU4ODFlOWMxMWYxYjJmZDk0YTA5NjM5ZjA1OGQxMjMxYjgwMzhlNTQzZDc3NzQ1OGNiNzc3MTVmZDY3YWYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.voF6EeKPDF6yCtnCd6fKIDFWLd2gYQpIf9k4Qr1-8fk)
- FOX fee curve discount higher than FWH discount (shapeshiftdao.eth)
![image](https://private-user-images.githubusercontent.com/17035424/406997369-502938df-c360-4f95-84e7-71fbb6f18145.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4MjY3MjksIm5iZiI6MTczODgyNjQyOSwicGF0aCI6Ii8xNzAzNTQyNC80MDY5OTczNjktNTAyOTM4ZGYtYzM2MC00Zjk1LTg0ZTctNzFmYmI2ZjE4MTQ1LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDA3MjAyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTliMWJmMTcwM2U5MDA4MWI0MDRjMjU0MzhmYjE0MzZhN2U2YzBjYmZjMzczOGZmOTQ2ZmVhZjFhZGMxMDU0OGYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.VdyLnDq4gF_Nkt-Ii28dSzu932FRGMWkEhqLFxrAl7g)
- Just under the fee curve - shapeshiftdao.eth
![image](https://private-user-images.githubusercontent.com/17035424/406997516-0db425ce-8726-40e7-8c66-54b38f32a734.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4MjY3MjksIm5iZiI6MTczODgyNjQyOSwicGF0aCI6Ii8xNzAzNTQyNC80MDY5OTc1MTYtMGRiNDI1Y2UtODcyNi00MGU3LThjNjYtNTRiMzhmMzJhNzM0LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDA3MjAyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWEzODk0NTMwNTVkODZjZjQxODkyNmNkMGYyMjc5ZjE0NThmZGQxMDU5NzhjOTFhMTliOGRkZDgzOTlhZmRkNzYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.TDUmvm2erHYh2gwvMe_UyMH6uHvvoNvThNFJvw1LR9w)
- FWH holder (11,000 FWH), 50% elapsed, tested with the monkey-patch below to get midpoint: half the bps, 100% the lulz
diff --git a/src/lib/fees/model.ts b/src/lib/fees/model.ts
index 20007fbad3..7a965dbcd4 100644
--- a/src/lib/fees/model.ts
+++ b/src/lib/fees/model.ts
@@ -82,7 +82,11 @@ export const calculateFees: CalculateFeeBps = ({
if (!isFoxWifHatCampaignActive) return bn(0)
if (!isFoxWifHatDiscountEligible) return bn(0)
- const currentTime = new Date().getTime()
+ // 50% monkey
+ const campaignStartTime = FOX_WIF_HAT_CAMPAIGN_STARTING_TIME_MS
+ const campaignEndTime = FOX_WIF_HAT_CAMPAIGN_ENDING_TIME_MS
+ const halfwayTime = campaignStartTime + (campaignEndTime - campaignStartTime) / 2
+ const currentTime = new Date(halfwayTime).getTime()
const totalCampaignDuration =
FOX_WIF_HAT_CAMPAIGN_ENDING_TIME_MS - FOX_WIF_HAT_CAMPAIGN_STARTING_TIME_MS
const timeElapsed = currentTime - FOX_WIF_HAT_CAMPAIGN_STARTING_TIME_MS
![image](https://private-user-images.githubusercontent.com/17035424/407002014-f3b163c6-390c-4f81-aaf8-0f6b72327edb.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4MjY3MjksIm5iZiI6MTczODgyNjQyOSwicGF0aCI6Ii8xNzAzNTQyNC80MDcwMDIwMTQtZjNiMTYzYzYtMzkwYy00ZjgxLWFhZjgtMGY2YjcyMzI3ZWRiLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDA3MjAyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTllMWMxYzYwYjgxZGU2ODg1ZDhjZjIyMjBmN2U4ODUyYmY2OTEzYmNlNmFiNWExODM5OTMyNjY0YWYzYWJkYzYmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.8MNuwL2cSZKYNHcg3G_IwRo6DilJNWuiR9hS4i_LFlA)
- Same as above but 100% time expired with the monkey-patch below: 0% the FWH discount, but still 100% here for the lulz
diff --git a/src/lib/fees/model.ts b/src/lib/fees/model.ts
index 20007fbad3..a66c1af4f9 100644
--- a/src/lib/fees/model.ts
+++ b/src/lib/fees/model.ts
@@ -82,7 +82,10 @@ export const calculateFees: CalculateFeeBps = ({
if (!isFoxWifHatCampaignActive) return bn(0)
if (!isFoxWifHatDiscountEligible) return bn(0)
- const currentTime = new Date().getTime()
+ // 100% time expired, no dice for you FWH holder
+ const campaignEndTime = FOX_WIF_HAT_CAMPAIGN_ENDING_TIME_MS
+ const expiredTime = campaignEndTime + 1000 // 1 second after campaign ends
+ const currentTime = new Date(expiredTime).getTime()
const totalCampaignDuration =
FOX_WIF_HAT_CAMPAIGN_ENDING_TIME_MS - FOX_WIF_HAT_CAMPAIGN_STARTING_TIME_MS
const timeElapsed = currentTime - FOX_WIF_HAT_CAMPAIGN_STARTING_TIME_MS
![image](https://private-user-images.githubusercontent.com/17035424/407002894-319f1e24-138e-4433-bd7d-4e46c983ca28.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg4MjY3MjksIm5iZiI6MTczODgyNjQyOSwicGF0aCI6Ii8xNzAzNTQyNC80MDcwMDI4OTQtMzE5ZjFlMjQtMTM4ZS00NDMzLWJkN2QtNGU0NmM5ODNjYTI4LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMDYlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjA2VDA3MjAyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTFmNWRiNjFjNjA0NGIwMzY0NDdiODk0MjNlMjg3MTUwYzBmNmZiNzRmYWE2ODI1MDI0ZmNjZTg0NmVmMjMxMDkmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.OXwODVMGRSkmdKV3-pf2l7FdiAJ-Esunvq2b4q_yD4U)
bda6f6f
to
17c06a9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Adding the foxwifhat discount if the section is enabled:
Added automated testsRemoved them as the flag is off in prod and is always off in the testsIssue (if applicable)
closes #8588
Risk
Medium, could result in free trades somehow
Testing
-- Traditional Fox discount
-- Fox Wif Hat discount (if you have at least 10k FWH, the discount decrease linearly)
-- If you are a dev, monkey patch the logic inside calculateFees to test that the highest discount possible
Engineering
Operations
Screenshots (if applicable)
very big fox holding (dao's addy)
No discount => no foxwifhat and no foxes
FOXWifHat holder
Free because feeBps are under 1 as float
Foxwifhatholder but 50% of the time expired already
23bps instead of 47
Foxwifhatholder but 100% of the time expired already
Expired but fox holding is so big that it's free!