fix: add approvals and other fixes for royalty upfront payments

storyprotocol · Feb 9, 2024 · 6bbc90a · 6bbc90a
1 parent 94423c2
commit 6bbc90a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/test/foundry/integration/big-bang/NftLicenseRoyalty.t.sol b/test/foundry/integration/big-bang/NftLicenseRoyalty.t.sol
@@ -103,6 +103,7 @@ contract BigBang_Integration_NftLicenseRoyalty is BaseIntegration, Integration_S
         // Bob mints 1 license from Alice's NFT 1 IPAccount, registers NFT 2 IPAccount, and links using the license
         {
             vm.startPrank(u.bob);
+            USDC.approve(address(royaltyPolicyLS), mintFeeAmount);
             uint256 bob_license_from_root_alice = licensingModule.mintLicense(
                 policyIds["uml_com_deriv_reciprocal"],
                 ipAcct[1], // Alice's IPAccount
@@ -120,6 +121,7 @@ contract BigBang_Integration_NftLicenseRoyalty is BaseIntegration, Integration_S
         // Carl mints 1 license from Bob's NFT 2 IPAccount, registers NFT 3 IPAccount, and links using the license
         {
             vm.startPrank(u.carl);
+            USDC.approve(address(royaltyPolicyLS), mintFeeAmount);
             uint256 carl_license_from_bob = licensingModule.mintLicense(
                 policyIds["uml_com_deriv_reciprocal"],
                 ipAcct[2], // Bob's IPAccount
@@ -149,6 +151,7 @@ contract BigBang_Integration_NftLicenseRoyalty is BaseIntegration, Integration_S
         // Dan mints 1 license from Carl's NFT 3 IPAccount, registers NFT 4 IPAccount, and links using the license
         {
             vm.startPrank(u.dan);
+            USDC.approve(address(royaltyPolicyLS), mintFeeAmount);
             uint256 dan_license_from_carl = licensingModule.mintLicense(
                 policyIds["uml_com_deriv_reciprocal"],
                 ipAcct[3], // Carl's IPAccount

diff --git a/test/foundry/integration/big-bang/SingleNftCollection.t.sol b/test/foundry/integration/big-bang/SingleNftCollection.t.sol
@@ -56,7 +56,7 @@ contract BigBang_Integration_SingleNftCollection is BaseIntegration, Integration
                 commercializers: new string[](0),
                 commercialRevShare: 10,
                 royaltyPolicy: address(royaltyPolicyLS),
-                mintingFeeAmount: mintFeeAmount,
+                mintingFeeAmount: 0, // no unpfront payment
                 mintingFeeToken: address(USDC)
             }),
             UMLPolicyDerivativeParams({

diff --git a/test/foundry/modules/licensing/LicensingModule.t.sol b/test/foundry/modules/licensing/LicensingModule.t.sol
@@ -123,6 +123,10 @@ contract LicensingModuleTest is Test {
 
         vm.label(ipId1, "IPAccount1");
         vm.label(ipId2, "IPAccount2");
+
+        // For `test_LicensingModule_licenseUri` to use UML policy, we must whitelist the royalty token.
+        // TODO: fix to use mock
+        royaltyModule.whitelistRoyaltyToken(address(USDC), true);
     }
 
     function _createPolicy() internal pure returns (bytes memory) {

diff --git a/test/foundry/modules/royalty/LSClaimer.t.sol b/test/foundry/modules/royalty/LSClaimer.t.sol
@@ -51,7 +51,7 @@ contract TestLSClaimer is TestHelper {
                 commercializers: new string[](0),
                 commercialRevShare: 10,
                 royaltyPolicy: address(royaltyPolicyLS),
-                mintingFeeAmount: mintFeeAmount,
+                mintingFeeAmount: 0, // no upfront payment for LSClaimer
                 mintingFeeToken: address(USDC)
             }),
             UMLPolicyDerivativeParams({