daoFeeShare functionality per KIP-33 #34
Open
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
cujowolf
requested changes
Feb 16, 2023
| @@ -73,9 +73,16 @@ contract RetireCarbonFacet is ReentrancyGuard { | |||
| retirementMessage | |||
| ); | |||
|
|
|||
| // Send any aggregator fees to treasury | |||
| uint256 daoFee; | |||
There was a problem hiding this comment.
We can break this out into its own function with LibRetire, perhaps LibRetire.sendFee(uint256 totalFee)
| @@ -64,6 +64,7 @@ contract DiamondInit { | |||
|
|
|||
| // Retirement convenience fee | |||
| s.fee = 1000; | |||
| s.daoFeeShare = 80000; | |||
There was a problem hiding this comment.
We should spin up a new init contract with only the changes and args needed for this diamond cut
| @@ -52,6 +52,7 @@ struct AppStorage { | |||
| mapping(address => Account.State) a; // Mapping of a user address to account state. | |||
| uint256 lastERC721Received; // Last ERC721 Toucan Retirement Certificate received. | |||
| uint256 fee; // Aggregator fee charged on all retirements to 3 decimals. 1000 = 1% | |||
| uint256 daoFeeShare; // Share of 'fee' for the DAO wallet, per KIP-33. 3 decimals. 1000 = 1% | |||
There was a problem hiding this comment.
Should we add a feeDivisor field and remove the magic numbers from the libraries?
There was a problem hiding this comment.
Yeah, definitely, I was thinking that as well as I was typing it in. I'll add it.
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.
Follows existing 'fee' logic.
Set value to 80% per KIP-33.
Closes issue #32 .