Skip to content

Fix issue about derivativesAllowed and derivativesAttribution#442

Merged
bonnie57 merged 2 commits intodevfrom
fix/derivative-allowed-in-commercial
Mar 3, 2025
Merged

Fix issue about derivativesAllowed and derivativesAttribution#442
bonnie57 merged 2 commits intodevfrom
fix/derivative-allowed-in-commercial

Conversation

@bonnie57
Copy link
Contributor

@bonnie57 bonnie57 commented Feb 28, 2025

Description

  • When PIL_TYPE is PIL_TYPE.COMMERCIAL_USE, the derivativesAllowed and derivativesAttribution should be false.
  • Fix should be able to counter existing dispute once integration test

DracoLi
DracoLi previously approved these changes Feb 28, 2025
@bonnie57 bonnie57 force-pushed the fix/derivative-allowed-in-commercial branch 2 times, most recently from 9727800 to adabc11 Compare March 3, 2025 02:02
@bonnie57 bonnie57 force-pushed the fix/derivative-allowed-in-commercial branch from adabc11 to 0a65844 Compare March 3, 2025 04:03
@bonnie57 bonnie57 requested a review from DracoLi March 3, 2025 07:00
DracoLi
DracoLi previously approved these changes Mar 3, 2025
@bonnie57 bonnie57 force-pushed the fix/derivative-allowed-in-commercial branch from ec1ab7d to cc22f21 Compare March 3, 2025 07:50
@bonnie57 bonnie57 merged commit a9e9896 into dev Mar 3, 2025
15 checks passed
@bonnie57 bonnie57 deleted the fix/derivative-allowed-in-commercial branch March 3, 2025 07:56
bonnie57 added a commit that referenced this pull request Mar 4, 2025
* Dispute Integration tests fixed and expanded

* PR Comments Addressed

* Update package.json

* PR - All comments addressed

* Comments addressed

* Update pnpm-lock.yaml

* Update pnpm-lock.yaml

* Update pnpm-lock.yaml

* Enhance contractCallWithFees with erc20 (#423)

* Add more methods from smart contracts

* Add tagIfRelatedIpInfringed method

* Add transfer,transferFrom method in wip module

* Add unit for transfer and transferFrom methods

* Update blockCreated including aeneid and mainnet

* Rename HandleTxOptionsResponse to TransactionResponse

* Implement auto approve about payRoyaltyOnBehalf method

* Enhance tagIfRelatedIpInfringed method

* Refactor code about contractCallWithFees

* Fix tests including unit and integration tests

* Enhance tagIfRelatedIpInfringed method

* Export the related types

* Modify typo

* Resolve dispute conflict and enhance the module integration test

* Refactor via comments

* Add todo to wait for confirmation

* Separate ERC20Options and WIPOptions

* Update the doc

* Update the doc about livenss unit

* Refactor via commits

* Refactor via comments

* Refactor via comments

* Update dispute.test.ts

* Add default value for DerivativeData and LicenseConfig

Add default value for LicenseConfig

Update the doc about multiple line

Update the doc

Update event with link

Update zero address

Modify licenseConfig logic

Refactor via comments

Enhance LicenseTermsData type

Make licensingConfig required in the setLicensingConfig method

Update default show style

* Update dispute.test.ts

* Update dispute.test.ts

* Add default value for DerivativeData

* Add default value for LicenseConfig

* Update the doc about multiple line

* Modify licenseConfig logic

* Enhance LicenseTermsData type

* Add Auto Wrapping Support including registerDerivative and mintAndRegisterIp

* Add mintFeeToken and mintFee in nftClient

* Move feeUtils test into utils test

* Throw error more specify when call getRevenueShare method

* Refactor via comments

* Add uri value for each PIL Flavor by default

* Reset package.json

* Make allowDuplicates optional

* Bind link with v1.3.1

* Bump up version to 1.3.0-rc.1

* Update dispute.test.ts

* feat: update generateIpMetadata and generateCreatorsMetadata to IPA Metadata Standard

* fix generateCreatorMetadata changes

* Add setIpMetadata method in ipAccount

* Remove useless ipAccount reference

* Update pr-internal.yml

* feat: Add dispute assertion to dispute client

* Refactor via comments

* add disputeAssertion docs

* Refactor claimAllRevenue via generated method

* Clean up useless code

* Add batchClaimAllRevenue method in the royalty module

* Refactor unwrap wip token

* Add unit test for royalty module

* Refactor code

* Refactor via comment

* Disable transfer and unwrap when call claimAllRevenue method

* Fix unit tests

* Modify unwrapWipTokens method with single call

* Refactor via comments

* Fix test

* Refactor via comments

* Throw error when unwrapWipTokens have multiple wip

* Export neccessary address including Lap, Lrp, Wip

* Fix type property

* Update claim all revenue description without transfer wip to ip

* Remove wip address for exporting

* resolves #440; export license config and license terms data

* feat: add bonnie as reviewer

* fix ipAsset ip metadata unit test

* Fix issue about derivativesAllowed and derivativesAttribution (#442)

* Fix issue about derivativesAllowed and derivativesAttribution

Skip the dispute assertion

* Update dispute assert test

---------

Co-authored-by: bpolania <boris.polania@gmail.com>
Co-authored-by: Draco <draco@dracoli.com>
Co-authored-by: Andy Wu <bwu2sfu@gmail.com>
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.

2 participants