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

Dispute modifications #60

Merged
merged 33 commits into from
Apr 12, 2024
Merged

Dispute modifications #60

merged 33 commits into from
Apr 12, 2024

Conversation

Spablob
Copy link

@Spablob Spablob commented Apr 11, 2024 •
edited
Loading

Dispute adjustments

  • add onResolveDispute hook for future-proofing
  • add new mechanic of permissionless self-tagging
  • add multicall inheritance (to facilitate batch call for tagging)

Other fixes

  • add missing zero variable initializer/constructor restrictions

@Spablob Spablob changed the title Dispute modifications Dispute modifications and royalty fixes Apr 11, 2024
@Spablob Spablob marked this pull request as ready for review April 11, 2024 12:45
@Spablob Spablob mentioned this pull request Apr 11, 2024
Merged
LeoHChen
LeoHChen requested changes Apr 11, 2024
View reviewed changes
Copy link

@LeoHChen LeoHChen left a comment

Choose a reason for hiding this comment

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

This one should be split into two PRs. One for Dispute modification and one for Royalty fix.

Ramarti
Ramarti reviewed Apr 11, 2024
View reviewed changes
Makefile Show resolved Hide resolved
Spablob and others added 11 commits April 12, 2024 08:30
@Spablob Spablob changed the title Dispute modifications and royalty fixes Dispute modifications Apr 12, 2024
@Spablob
Copy link
Author

Spablob commented Apr 12, 2024

This one should be split into two PRs. One for Dispute modification and one for Royalty fix.

Removed royalty-related fixes from the pr in 1520309

@LeoHChen LeoHChen merged commit fed4a6c into storyprotocol:main Apr 12, 2024
3 checks passed
jdubpark added a commit to jdubpark/sp-protocol-core that referenced this pull request Apr 14, 2024
@Spablob @jdubpark
@kingster-will @AndyBoWu @Ramarti
Dispute modifications (storyprotocol#60)
e62c6db 
* add new tagDerivativeIfParentInfringed function

* format fix

* rebase: eliminate data uniqueness

* fix rebase duplication

* revert royalty related fixes

* format fix

* add business logic comments

* add restriction clarifications

* fix comment size

---------

Co-authored-by: Jongwon Park <[email protected]>
Co-authored-by: kingster-will <[email protected]>
Co-authored-by: Andy Wu <[email protected]>
Co-authored-by: Ramarti <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdubpark jdubpark jdubpark left review comments

@Ramarti Ramarti Ramarti left review comments

@kingster-will kingster-will kingster-will approved these changes

@LeoHChen LeoHChen LeoHChen approved these changes

@leeren leeren Awaiting requested review from leeren

@AndyBoWu AndyBoWu Awaiting requested review from AndyBoWu

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Spablob @Ramarti @LeoHChen @jdubpark @kingster-will @AndyBoWu