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

add setFeeCollector #776

Merged
merged 3 commits into from
Aug 1, 2023
Merged

add setFeeCollector #776

merged 3 commits into from
Aug 1, 2023

Conversation

alexcos20
Copy link
Member

@alexcos20 alexcos20 commented Jul 27, 2023 •
edited
Loading

Closes #772

Changes proposed in this PR:

  • add setFeeCollector

Since contract size exceeded 24k, I also had to :

  • remove setData (we have it at ERC721 level)
  • move event NewPaymentCollector to proper place
  • removed NewDispenser event (we will not have dispensers)

@alexcos20 alexcos20 requested a review from trizin July 27, 2023 10:02
@alexcos20 alexcos20 self-assigned this Jul 27, 2023
@alexcos20 alexcos20 requested a review from trentmc as a code owner July 27, 2023 10:02
@alexcos20 alexcos20 added this to the v2.0.0 milestone Jul 27, 2023
@alexcos20 alexcos20 linked an issue Jul 27, 2023 that may be closed by this pull request
Template3: Allow erc20Deployer to change feeCollector #772
Closed
github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 27, 2023
View reviewed changes
contracts/templates/ERC20Template3.sol
* @param _newFeeCollector new fee collector
*/

function setFeeCollector(address _newFeeCollector) external onlyERC20Deployer{

Check warning

Code scanning / Slither

Conformance to Solidity naming conventions Warning

Parameter ERC20Template3.setFeeCollector(address)._newFeeCollector is not in mixedCase
@alexcos20 alexcos20 changed the base branch from v2.0 to issue779-use-timestamp-instead-of-block-number-in-predictoor August 1, 2023 09:29
@trizin
Copy link
Contributor

trizin commented Aug 1, 2023

Should we remove other stuff related to dispensers? There are some variables and functions, such as: https://github.com/oceanprotocol/contracts/blob/a0ccf2b33d58d11ddcaf1d329971610a2782ca5f/contracts/templates/ERC20Template3.sol#L896C1-L898C6

@alexcos20
Copy link
Member Author

Should we remove other stuff related to dispensers? There are some variables and functions, such as: https://github.com/oceanprotocol/contracts/blob/a0ccf2b33d58d11ddcaf1d329971610a2782ca5f/contracts/templates/ERC20Template3.sol#L896C1-L898C6

I would keep that to make it compatible with the other two templates

@alexcos20 alexcos20 merged commit 796fe91 into issue779-use-timestamp-instead-of-block-number-in-predictoor Aug 1, 2023
8 checks passed
@alexcos20 alexcos20 deleted the feature/feeCollector_setter branch August 1, 2023 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trizin trizin trizin approved these changes

@trentmc trentmc Awaiting requested review from trentmc

Assignees

@alexcos20 alexcos20

Labels
None yet
Projects
None yet
Milestone
Contracts v2.0.0
Development

Successfully merging this pull request may close these issues.

Template3: Allow erc20Deployer to change feeCollector
2 participants
@alexcos20 @trizin