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

Remove discounted fee calculation logic from Deployers and Farm factory updates #22

Merged
merged 8 commits into from
Nov 16, 2023

Conversation

arcantheon
Copy link
Collaborator

No description provided.

@arcantheon arcantheon changed the base branch from main to dev November 13, 2023 11:35
@arcantheon arcantheon changed the title Removed discounted fee calculation logic Remove discounted fee calculation logic from Deployers Nov 13, 2023
Copy link
Member

@parv3213 parv3213 left a comment

Choose a reason for hiding this comment

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

Everything looks good.

  • Need to remove discounted fee references from Readme.
  • @bayou020 This PR requires subgraph changes.

Although I suggest to first merge #17 #18 #20 so that we can also fix the tests for this PR

@arcantheon arcantheon changed the title Remove discounted fee calculation logic from Deployers Remove discounted fee calculation logic from Deployers and Farm factory updates Nov 14, 2023
@arcantheon arcantheon requested a review from bayou020 November 14, 2023 12:30
return _calculateFees(_tokenA, _tokenB);
/// @notice A public view function to get fees from Farm Factory
/// @return feeReceiver of feeToken in feeAmount
function getFees(address _deployerAccount)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Mark this function as external

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Resolved 06b706b

/// @dev Function fetches all the fee params from farmFactory.
function _collectFee() internal virtual {
// Here msg.sender would be the deployer/creator of the farm which will be checked in privileged deployer list
(address feeReceiver, address feeToken, uint256 feeAmount) = getFees(msg.sender);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Directly call the IFarmFactory() contract.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Resolved 06b706b

@YashP16 YashP16 merged commit 78e1237 into dev Nov 16, 2023
1 check passed
@YashP16 YashP16 deleted the wip/deployer-upgrades branch November 16, 2023 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants