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.

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

Alpha Version #245

Merged
merged 54 commits into from
Dec 8, 2023
Merged

Alpha Version #245

merged 54 commits into from
Dec 8, 2023

Conversation

Ramarti
Copy link
Contributor

@Ramarti Ramarti commented Dec 8, 2023

Changes for the first public version of Story Protocol

leeren and others added 30 commits November 7, 2023 01:18
* Adds core authorization and attribution to the GIPR

* Fixes accidental old code merge

* Fixes IPAssetOrg Test
…le (#160)

* story protocol entrypoint

* remove event emitter

* refactor IPOrg

* fix

* register ipOrg

* wip

* module registry basic functionality

* remove leftover test

* module registry routing to modules

* add module registyr to SPG

* relationship registry

* connected SPG with protocol module

* config types

* test remove relationship

* relationship setting

* comments and fixes

* unify module registry events

* refactor selfParams into moduleParams

* view methods in IPAssetRegistry

---------

Co-authored-by: Raul <[email protected]>
…s Base Hooks (#161)

* Implementation of Hooks Architecture with Async and Sync Base Hooks
* Add TokenGatedHook Contract for NFT Ownership Verification
* Refactor HookRegistry to support multiple config domain

Introduce `registryKey` to separate different config domains.
And Integrating BaseModule and Hooks
* list all files in workspace

* upgrade openzepplin to 4.9.3
* Refactors IP Org

* Adds scaffolding for metadata rendering and ip asset creation

* Modularizes IP Org transfers and adds metadata wrapping

* Adds IPOrg registration

* Fixes stack too deep

* Adds back hookregistrykey

* Fixes testing

* Finalizes registration module (adds necessary FEs needed for SPG integration)

* Fix transfer bug
* configure ipOrg license

* terms repository, framework config

* wip

* introducing hooks for terms

* short string helpers

* terms hook

* licensing module, config ipOrg licensing framework

* cleanup

* IPA goes into IPAsset library

* deleted old interfaces

* delete old contracts

* refactored configuration to be purely terms based, testing creating licenses

* refactor TermsConfig, added FixedSet

* create root license

* minting LNFT

* refactor licensing term libs

* fix test

* refactor to account for enshrined share alike

* refactored IPA_LICENSE and SUBLICENSE_OF back into the licensing module

* simplified terms data

* add comments:

* more comments

* fixed comments and added access control to license registry

* import order

* todo hook key providing

* remove hardhat tests

* fixing compilation errors

* introducing ipa registration module

* temporally remove tests

---------

Co-authored-by: Raul <[email protected]>
* Refactor hook registry access control by IPOrg owner
* Add hooksRegistry() function to modules
* Adds testing for registration module

* Adds scaffolding for custom ipAssetTypes

* Remove old comments
* hookity hook

* hook ouuuut

* lol

* wip testing

* simplify licensing

* WIP

* fixes

* more fixes

* wip

* fix tests

* typo

* separated termrepository from accesscontrol

* Update contracts/modules/licensing/LicensingModule.sol

Co-authored-by: kingster-will <[email protected]>

---------

Co-authored-by: Raul <[email protected]>
Co-authored-by: kingster-will <[email protected]>
* deploy stroy protocol contracts to Sepolia

* redeploy with latest change

* redeploy for with PR#181

* redeploy for with active license PR#176

* Update script/foundry/deployment/Main.s.sol

* Update script/foundry/deployment/Main.s.sol

---------

Co-authored-by: Ramarti <[email protected]>
* Fix following issues
- remove underscore postfix from event field
- rename event field `ipaId` to `ipAssetId`
- fix wrong `owner` in IPOrgRegistered event
- add ipAssetTypes into IPOrgRegistered event
- remove `indexed` from string or array event fields
---------

Co-authored-by: Ramarti <[email protected]>
…es (#190)

* Apply dual licenses to source code, BUSL and MIT
…et Type (#188)

* ip org types and elimination of ip asset type

* fixing tests

* refactor registration tests

* fixed existing tests

* test iporg

* test protocol relationship types configuration

* test relationship setting

* remove unused struct

* removed commented out code

* refactor tokenURI

* fix

---------

Co-authored-by: Raul <[email protected]>
…191)

* Temporarily Comment Out Unused Modules for Alpha Release Preparation

We have temporarily commented out the Collect and Royalty
modules to streamline the codebase for the alpha release.

These changes are not permanent and these modules will
be reintroduced in future releases.
* Adds detailed documentation for major contracts

* Prevent complaining about max line
* Update deployment script and Re-deploy protocol
* test access control

* test access controlled

---------

Co-authored-by: Raul <[email protected]>
* licensing framework repo

* config iporg

* WIP

* moved some verification to LicenseRegistry

* simplify libs

* wip

* addReciprocal is in LicenseRegistry for efficiency, non reciprocal has implementation, uncommented the rest

* wip testing licensing

* test create license

* test other happy paths and fixes

* some comments

* whitespace

* made default revoker configurable

---------

Co-authored-by: Raul <[email protected]>
* Remove 'indexed' from string relType events

* Module registry events test

* Add make coverage script

* Add more access control tests

* Add more IPOrg (controller) tests

* fix: IPOrgTransferred event emit, cache record.owner for prevOwner event arg

* Add more test for IPOrg controller

Coverage except internal functions and `initialize` for upgradable. Need
to use harness for internal functions.

* Add basic tests for FixedSet util

* fix: FixedSet.UintSet indexOf argument signature

* Add integration tests to full line coverage

* Add coverage instruction

* Updated tests for e2e and modules

* Contract bug fix & comment nit

* lcov update

* Fix licensing module test cases

* Separate tests & remove lcov file
Ramarti and others added 24 commits December 6, 2023 22:03
* emit License data and gas saving in reciprocals

* deployment

---------

Co-authored-by: Raul <[email protected]>
* BUSL changed to alpha agreement

* verified deployment

---------

Co-authored-by: Raul <[email protected]>
…BaseModule (#230)

* Introduce PolygonTokenHook and integrate Async hook with BaseMoudle
- A new contract PolygonTokenHook is introduced. 
- The BaseModule contract is updated to support the execution of asynchronous hooks.
- The type of hook (synchronous or asynchronous) is determined by the first two bits of the hook address.
* bitmask

* wip refactor derivatives to proper options

* wip, hitting stack too deep

* wip fixed stack too deep, fixing tests

* fix bitmask

* fix, test, remove logs, fix internal to pure

---------

Co-authored-by: Raul <[email protected]>
Adds new authorization logic around the module registry
* fix emission for ipOrg config

* deployed fix events

---------

Co-authored-by: Raul <[email protected]>
* wip

* wip

* fix emission for ipOrg config

* metadata

* event for indexing

* Update test/foundry/lib/BitMask.t.sol

* Update test/foundry/lib/BitMask.t.sol

* fix

* deployment

---------

Co-authored-by: Raul <[email protected]>
* Remove 'indexed' from string relType events

* Module registry events test

* Add make coverage script

* Add more access control tests

* Add more IPOrg (controller) tests

* fix: IPOrgTransferred event emit, cache record.owner for prevOwner event arg

* Add more test for IPOrg controller

Coverage except internal functions and `initialize` for upgradable. Need
to use harness for internal functions.

* Add basic tests for FixedSet util

* fix: FixedSet.UintSet indexOf argument signature

* Add integration tests to full line coverage

* Add coverage instruction

* Updated tests for e2e and modules

* Contract bug fix & comment nit

* lcov update

* Fix licensing module test cases

* Separate tests & remove lcov file

* Update integration tests

* Small fixes for contracts & interfaces

* Update e2e and module tests & comment out unready fn

* Updated tests

* More integration tests

* Fix param comment

* Add integration tests, fix unit tests, fix contract bugs

* Remove commented out function

* Update LicensingModule.Licensing.t.sol

* Update LicensingModule.Config.t.sol
* fix emission for ipOrg config

* added optional ipa_param

* link ipa to license on creation

* deployment

---------

Co-authored-by: Raul <[email protected]>
* Polishes comments and standardizes formatting

* Fixes more formatting

* Adds more comments

* Fixes minor doc error
* licensing lib commented

* framework repo

* comment licensing module

* fixes

* lint

---------

Co-authored-by: Raul <[email protected]>
* Add more nit tests for coverage

* Remove unused lib

* Remove library

* Fix nit testcase
* readme

* renamed mvp folder to legacy

* fix image

---------

Co-authored-by: Raul <[email protected]>
@Ramarti Ramarti merged commit 7248437 into main Dec 8, 2023
1 check passed
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.

5 participants