Add Licensing-Royalty integration and new LAP royalty policy #99

jdubpark · 2024-02-16T14:05:47Z

Adds internal hooks for royalty and license integration
Adds the new LAP royalty policy and Ancestors vaults contracts and unit tests

Rebase + test fixing from #94 (replace and closes #94)

@Ramarti @Spablob Please explain the new royalty and licensing system here.

add license integration hooks to royalty module Add royalty policy LAP and ancestors vault comment out required files for integration adjustment in the errors.sol file add array utils lib adjust git.ignore file remove parentIpIds from onLicenseMinting minor spelling fix fixes related with removing parentIpIds from onLicenseMinting add natspec on onLinkToParents add license data and external data inputs adjust interfaces adjust error.sol file adjust ancestorsVault contract and unit tests adjust royalty policy LAP contract and unit tests test fixes

fixing tests delete LSClaimer and RoyaltyPolicyLS add payRoyaltyOnBehalf unit tests fixed some tests

contracts/interfaces/modules/licensing/ILicensingModule.sol

contracts/modules/licensing/LicensingModule.sol

script/foundry/deployment/Main.s.sol

LeoHChen

a few minor comments

contracts/interfaces/modules/licensing/ILicensingModule.sol

contracts/interfaces/modules/licensing/IPolicyFrameworkManager.sol

contracts/interfaces/modules/royalty/IRoyaltyModule.sol

contracts/interfaces/modules/royalty/policies/IRoyaltyPolicy.sol

contracts/lib/Licensing.sol

contracts/modules/dispute-module/DisputeModule.sol

contracts/modules/licensing/LicensingModule.sol

contracts/modules/licensing/UMLPolicyFrameworkManager.sol

contracts/modules/royalty-module/policies/AncestorsVaultLAP.sol

contracts/modules/royalty-module/policies/RoyaltyPolicyLAP.sol

script/foundry/deployment/Main.s.sol

…otocol#99) * Add Licensing-Royalty integration and new LAP royalty policy * add license integration hooks to royalty module * Add royalty policy LAP and ancestors vault * add natspec on onLinkToParents * add license data and external data inputs * adjust interfaces * adjust ancestorsVault contract and unit tests * adjust royalty policy LAP contract and unit tests * feat: License + Royalty integration storyprotocol#94 off rebase * test: fixing tests and flows * fix: royalty policy onLicenseMinting pulled out to correct position * test: Integration fix for SingleNftCollection test --------- Co-authored-by: Spablob <[email protected]> Co-authored-by: Raul <[email protected]>

Ramarti mentioned this pull request Feb 16, 2024

Extracting royalty policy specific logic out of Licensing Module #87

Closed

jdubpark marked this pull request as ready for review February 16, 2024 23:31

jdubpark requested a review from a team February 16, 2024 23:33

Spablob and others added 14 commits February 16, 2024 18:58

wip: refactored

1d51003

fixing tests delete LSClaimer and RoyaltyPolicyLS add payRoyaltyOnBehalf unit tests fixed some tests

config: solhint

562189d

feat: License + Royalty integration #94 off rebase

2c67abe

test: fixing tests and flows

ed5f03d

fix(tmp): main script

5a325ee

fix: royalty policy onLicenseMinting pulled out to correct position

324bff3

test: Integration fix for SingleNftCollection test

9f0bcb7

style: solhint

e7ff9f9

fix: rebase main from PR #93

b412227

fix: revoked license check on linking

4e06183

fix: metadata uri return dedup

5d68101

test: remove uri check temporarily; imports

fd4d871

style: linting

8163d37

jdubpark force-pushed the limited-tree-royalty-policy branch from fcb1142 to 8163d37 Compare February 17, 2024 01:33