chore: update dependencies to protocol-core v1.2.1 (#63)

* test(mocks): import mocks directly from protocol core

* chore: update dependencies to protocol-core v1.2.1

Author: sebsadface

foundry.toml

@@ -7,7 +7,7 @@ gas_reports = ["*"]
 optimizer = true
 optimizer_runs = 20000
 test = 'test'
-solc = '0.8.23'
+solc = '0.8.26'
 fs_permissions = [
     { access = 'read', path = './' },
     { access = 'read-write', path = './deploy-out' },

package.json

@@ -40,7 +40,7 @@
     "@openzeppelin/contracts": "5.0.1",
     "@openzeppelin/contracts-upgradeable": "5.0.1",
     "@story-protocol/create3-deployer": "github:storyprotocol/create3-deployer#main",
-    "@story-protocol/protocol-core": "github:storyprotocol/protocol-core-v1#v1.2.0",
+    "@story-protocol/protocol-core": "github:storyprotocol/protocol-core-v1#v1.2.1",
     "erc6551": "^0.3.1",
     "solady": "^0.0.192"
   }

remappings.txt

@@ -2,6 +2,7 @@
 @openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/
 @storyprotocol/core/=node_modules/@story-protocol/protocol-core/contracts/
 @storyprotocol/script/=node_modules/@story-protocol/protocol-core/script/foundry/
+@storyprotocol/test/=node_modules/@story-protocol/protocol-core/test/foundry/
 @create3-deployer/=node_modules/@story-protocol/create3-deployer/
 @solady/=node_modules/solady/
 ds-test/=lib/forge-std/lib/ds-test/src/

script/deployment/MockRewardPool.s.sol

@@ -6,13 +6,16 @@ pragma solidity ^0.8.23;
 import { console2 } from "forge-std/console2.sol";
 import { Script } from "forge-std/Script.sol";
 import { stdJson } from "forge-std/StdJson.sol";
+
 // script
 import { BroadcastManager } from "../utils/BroadcastManager.s.sol";
 import { JsonDeploymentHandler } from "../utils/JsonDeploymentHandler.s.sol";
+import { StoryProtocolCoreAddressManager } from "../utils/StoryProtocolCoreAddressManager.sol";
+
 // test
-import { MockEvenSplitGroupPool } from "test/mocks/MockEvenSplitGroupPool.sol";
+import { MockEvenSplitGroupPool } from "@storyprotocol/test/mocks/grouping/MockEvenSplitGroupPool.sol";
 
-contract MockRewardPool is Script, BroadcastManager, JsonDeploymentHandler {
+contract MockRewardPool is Script, BroadcastManager, JsonDeploymentHandler, StoryProtocolCoreAddressManager{
     using stdJson for string;
 
     constructor() JsonDeploymentHandler("main") {}
@@ -31,7 +34,7 @@ contract MockRewardPool is Script, BroadcastManager, JsonDeploymentHandler {
 
     function _deployMockRewardPool() private {
         _predeploy("MockEvenSplitGroupPool");
-        MockEvenSplitGroupPool mockEvenSplitGroupPool = new MockEvenSplitGroupPool();
+        MockEvenSplitGroupPool mockEvenSplitGroupPool = new MockEvenSplitGroupPool(royaltyModuleAddr);
         _postdeploy("MockEvenSplitGroupPool", address(mockEvenSplitGroupPool));
     }
 

test/mocks/MockERC20.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.23;
 
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 

test/mocks/MockERC721.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.23;
+pragma solidity ^0.8.23;
 
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 

test/mocks/MockEvenSplitGroupPool.sol

@@ -32,6 +32,8 @@ import { IAccessController } from "@storyprotocol/core/interfaces/access/IAccess
 import { IIPAccount } from "@storyprotocol/core/interfaces/IIPAccount.sol";
 import { ILicensingModule } from "@storyprotocol/core/interfaces/modules/licensing/ILicensingModule.sol";
 import { ICoreMetadataModule } from "@storyprotocol/core/interfaces/modules/metadata/ICoreMetadataModule.sol";
+import { MockIPGraph } from "@storyprotocol/test/mocks/MockIPGraph.sol";
+import { MockEvenSplitGroupPool } from "@storyprotocol/test/mocks/grouping/MockEvenSplitGroupPool.sol";
 
 import { StoryProtocolGateway } from "../../contracts/StoryProtocolGateway.sol";
 import { IStoryProtocolGateway as ISPG } from "../../contracts/interfaces/IStoryProtocolGateway.sol";
@@ -40,8 +42,6 @@ import { SPGNFT } from "../../contracts/SPGNFT.sol";
 import { ISPGNFT } from "../../contracts/interfaces/ISPGNFT.sol";
 import { TestProxyHelper } from "./TestProxyHelper.t.sol";
 import { MockERC20 } from "../mocks/MockERC20.sol";
-import { MockIPGraph } from "../mocks/MockIPGraph.sol";
-import { MockEvenSplitGroupPool } from "../mocks/MockEvenSplitGroupPool.sol";
 
 /// @title Base Test Contract
 contract BaseTest is Test {
@@ -325,7 +325,7 @@ contract BaseTest is Test {
         require(_loadProxyImpl(address(licensingModule)) == impl, "LicensingModule Proxy Implementation Mismatch");
 
         impl = address(0); // Make sure we don't deploy wrong impl
-        impl = address(new RoyaltyPolicyLAP(address(royaltyModule), address(licensingModule), address(ipGraphACL)));
+        impl = address(new RoyaltyPolicyLAP(address(royaltyModule), address(ipGraphACL)));
         royaltyPolicyLAP = RoyaltyPolicyLAP(
             TestProxyHelper.deployUUPSProxy(
                 create3Deployer,
@@ -560,7 +560,7 @@ contract BaseTest is Test {
 
     function setUp_test_Misc() public {
         mockToken = new MockERC20();
-        rewardPool = new MockEvenSplitGroupPool();
+        rewardPool = new MockEvenSplitGroupPool(address(royaltyModule));
 
         royaltyModule.whitelistRoyaltyToken(address(mockToken), true);
         licenseRegistry.setDefaultLicenseTerms(address(pilTemplate), 0);