Skip to content

Dispute modifications#60

Merged
LeoHChen merged 33 commits intostoryprotocol:mainfrom
Spablob:dispute-adjustments
Apr 12, 2024
Merged

Dispute modifications#60
LeoHChen merged 33 commits intostoryprotocol:mainfrom
Spablob:dispute-adjustments

Conversation

@Spablob
Copy link
Copy Markdown

@Spablob Spablob commented Apr 11, 2024

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
Comment thread contracts/modules/dispute/DisputeModule.sol
Copy link
Copy Markdown

@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.

Comment thread Makefile
Comment thread contracts/modules/dispute/DisputeModule.sol
Comment thread contracts/lib/DataUniqueness.sol Outdated
Comment thread contracts/interfaces/modules/dispute/IDisputeModule.sol
Comment thread contracts/modules/royalty/policies/RoyaltyPolicyLAP.sol
@Spablob Spablob changed the title Dispute modifications and royalty fixes Dispute modifications Apr 12, 2024
@Spablob
Copy link
Copy Markdown
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

Comment thread contracts/interfaces/modules/dispute/IDisputeModule.sol
Comment thread contracts/modules/dispute/DisputeModule.sol
@LeoHChen LeoHChen merged commit fed4a6c into storyprotocol:main Apr 12, 2024
jdubpark added a commit to jdubpark/sp-protocol-core that referenced this pull request Apr 14, 2024
* 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 <contact@parkjongwon.com>
Co-authored-by: kingster-will <83567446+kingster-will@users.noreply.github.com>
Co-authored-by: Andy Wu <bwu2sfu@gmail.com>
Co-authored-by: Ramarti <raul.mf86@gmail.com>
kingster-will pushed a commit to kingster-will/protocol-core-v1-dev that referenced this pull request Jan 31, 2025
kingster-will pushed a commit that referenced this pull request Jan 31, 2025
irfand29 pushed a commit to irfand29/protocol-core-v1 that referenced this pull request Feb 8, 2025
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.

6 participants