Skip to content

Port Private Fork Changes#391

Merged
kingster-will merged 78 commits intostoryprotocol:mainfrom
kingster-will:chore/merge-back-seciryt-fix
Jan 31, 2025
Merged

Port Private Fork Changes#391
kingster-will merged 78 commits intostoryprotocol:mainfrom
kingster-will:chore/merge-back-seciryt-fix

Conversation

@kingster-will
Copy link
Copy Markdown
Collaborator

Description

This PR ports changes made in a private fork back to the main repository.

Spablob and others added 30 commits January 31, 2025 08:28
adjust UMA setup in deployment script
simplify and add unit tests

lint and remove unused code

enhance to calculate pending on demand

rename var name and add more comments

add more comments.
* update hardhat tests

* Update hardhat_e2e.yml

* add set ipa metadata test

* update e2e test workflow
lint fix

solhint disable quotes fix

format fix
… be whitelisted (storyprotocol#16)

lint fix

rename error

prettier quote altering fix
* add the p1 tests

* add tests for permission and register derivative

* Deploy oov3 sandbox (storyprotocol#31)

* update workflow

* update workflow

* test

* test

* test

* test

* test

* update workflow

* add dispute tests

* Update dispute.test.ts

* Update hardhat_e2e.yml

* Update dispute.test.ts

---------

Co-authored-by: Jacqueline Zhang <131138188+jacqueline-57b@users.noreply.github.com>
Co-authored-by: Jacqueline Zhang <jacqueline@57blocks.com>
sebsadface and others added 25 commits January 31, 2025 08:34
* fix 3 failures
1. Shall not add IP to group if IP does not share the same licensing terms as the group
2. Dispute - Set tags to the derivative IP assets if the parent infringed
3. Dispute - Set tags to the derivative IP assets if the parent has not infringed
…tocol#78)" (storyprotocol#81)

This reverts commit e141a74839e9c4144b94fb924a0e445bc70f4c0c.
* add guardian role config to deploy script

* add grand role delay

* fix action delays

* add guardian role validation

* additional guardian role validation

* update upgraderExecDelay to 1 day
@kingster-will kingster-will merged commit 108f447 into storyprotocol:main Jan 31, 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