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

Release candidate #556

Merged
merged 57 commits into from
Mar 25, 2022
Merged

Release candidate #556

merged 57 commits into from
Mar 25, 2022

Conversation

alexcos20
Copy link
Member

@alexcos20 alexcos20 commented Mar 2, 2022 •
edited

Closes #553
Closes #554
Closes #557
Closes #558
Closes #559
Closes #560
Closes #561

This is a release candidate

@alexcos20 alexcos20 added this to the V4 milestone Mar 2, 2022
@alexcos20 alexcos20 self-assigned this Mar 2, 2022
@alexcos20 alexcos20 changed the title closes #553 and #554 Release candidate Mar 2, 2022
This was linked to issues Mar 4, 2022
Implement agreed OPC fees #553
Closed
OPC Consume fee #554
Closed
Weird hardhat dependencies #557
Closed
@alexcos20 alexcos20 linked an issue Mar 10, 2022 that may be closed by this pull request
NFT is not up to standard #558
Closed
@alexcos20 alexcos20 linked an issue Mar 10, 2022 that may be closed by this pull request
ERC20Template /ERC20Enterprise imports unused ERC725 #559
Closed
@alexcos20 alexcos20 mentioned this pull request Mar 12, 2022
Closed
@alexcos20 alexcos20 linked an issue Mar 12, 2022 that may be closed by this pull request
Vesting send token to original owner when NFT is transferred #560
Closed
@alexcos20 alexcos20 linked an issue Mar 12, 2022 that may be closed by this pull request
FactoryRouter.isOceanToken() should be isApprovedToken(), etc #561
Closed
@alexcos20 alexcos20 linked an issue Mar 17, 2022 that may be closed by this pull request
ERC20Enterprise: OPC Consume Fee #571
Closed
@alexcos20
Copy link
Member Author

alexcos20 commented Mar 19, 2022 •
edited

Notes for previous commit 5ff0517

Facts:

  • why do we need an owner for FixedRate & Dispenser, when we have nft.ownerOf and roles ?
  • why do we need to send funds to owners, when we could just use erc20.getPaymentCollector() ?
  • when somebody buys an NFT, he is expecting a ready-to-use asset?

Changes:

  • either NFT.owner or any address with deployERC20 role can control FixedRate/Dispenser (activate, deactivate, setRate, etc)
  • when calling collect functions, all funds are transferred to erc20.getPaymentCollector()
  • remove Terminate functions, because they are no longer need give the above
  • keep "owner" at FixedRate/Dispenser just for subgraph reasons

@alexcos20
Copy link
Member Author

For here on, no contract changes. only deployments, artifacts update, new release

@alexcos20
Copy link
Member Author

^
Proper cleanPermissions:

  • iterate though fixedrates & collect all datatokens & basetokens
  • iterate though dispensers & collect all datatokens
  • keep minter role for existing fixedrates & dispensers

@alexcos20
Copy link
Member Author

tests are failing due to alchemy. will wait 1h before releasing new version

@alexcos20 alexcos20 merged commit 7a837eb into v4main_postaudit Mar 25, 2022
@alexcos20 alexcos20 deleted the feature/v1.0.0-rc1 branch March 25, 2022 05:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trentmc trentmc Awaiting requested review from trentmc

Assignees

@alexcos20 alexcos20

Labels
None yet
Projects
None yet
Milestone
V4
1 participant
@alexcos20