From d173ea67eb3af18b7a351977632bbb29211fa412 Mon Sep 17 00:00:00 2001 From: Sebastian Liu Date: Fri, 30 Aug 2024 15:43:52 -0700 Subject: [PATCH] feat(script): update scripts to support grouping --- script/Main.s.sol | 4 +--- script/UpgradeSPG.s.sol | 2 -- script/UpgradeSPGNFT.s.sol | 4 +++- script/utils/StoryProtocolCoreAddressManager.sol | 4 ++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/script/Main.s.sol b/script/Main.s.sol index e46322a..f4a7137 100644 --- a/script/Main.s.sol +++ b/script/Main.s.sol @@ -4,11 +4,9 @@ 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"; import { ICreate3Deployer } from "@create3-deployer/contracts/Create3Deployer.sol"; import { UpgradeableBeacon } from "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol"; -import { IPAssetRegistry } from "@storyprotocol/core/registries/IPAssetRegistry.sol"; import { StoryProtocolGateway } from "../contracts/StoryProtocolGateway.sol"; import { SPGNFT } from "../contracts/SPGNFT.sol"; @@ -103,7 +101,7 @@ contract Main is Script, StoryProtocolCoreAddressManager, BroadcastManager, Json console2.log(string.concat(contractKey, " deployed to:"), newAddress); } - function _getSalt(string memory name) private view returns (bytes32 salt) { + function _getSalt(string memory name) private pure returns (bytes32 salt) { salt = keccak256(abi.encode(name, create3SaltSeed)); } } diff --git a/script/UpgradeSPG.s.sol b/script/UpgradeSPG.s.sol index 4031dfd..56d6017 100644 --- a/script/UpgradeSPG.s.sol +++ b/script/UpgradeSPG.s.sol @@ -15,8 +15,6 @@ import { StringUtil } from "./utils/StringUtil.sol"; import { BroadcastManager } from "./utils/BroadcastManager.s.sol"; import { JsonDeploymentHandler } from "./utils/JsonDeploymentHandler.s.sol"; -import { TestProxyHelper } from "../test/utils/TestProxyHelper.t.sol"; - contract UpgradeSPG is Script, StoryProtocolCoreAddressManager, diff --git a/script/UpgradeSPGNFT.s.sol b/script/UpgradeSPGNFT.s.sol index 955e292..b3aa6ed 100644 --- a/script/UpgradeSPGNFT.s.sol +++ b/script/UpgradeSPGNFT.s.sol @@ -8,6 +8,7 @@ import { Script } from "forge-std/Script.sol"; import { UpgradeableBeacon } from "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol"; import { StoryProtocolGateway } from "../contracts/StoryProtocolGateway.sol"; +import { GroupingWorkflow } from "../contracts/GroupingWorkflow.sol"; import { SPGNFT } from "../contracts/SPGNFT.sol"; import { StoryProtocolPeripheryAddressManager } from "./utils/StoryProtocolPeripheryAddressManager.sol"; @@ -19,6 +20,7 @@ contract UpgradeSPGNFT is Script, StoryProtocolPeripheryAddressManager, Broadcas using StringUtil for uint256; StoryProtocolGateway private spg; + GroupingWorkflow private groupingWorkflow; SPGNFT private spgNftImpl; UpgradeableBeacon private spgNftBeacon; @@ -48,7 +50,7 @@ contract UpgradeSPGNFT is Script, StoryProtocolPeripheryAddressManager, Broadcas _writeAddress("SPGNFTBeacon", address(spgNftBeacon)); _predeploy("SPGNFTImpl"); - spgNftImpl = new SPGNFT(address(spg)); + spgNftImpl = new SPGNFT(address(spg), address(groupingWorkflow)); _postdeploy("SPGNFTImpl", address(spgNftImpl)); } diff --git a/script/utils/StoryProtocolCoreAddressManager.sol b/script/utils/StoryProtocolCoreAddressManager.sol index b0c4ba5..13ba184 100644 --- a/script/utils/StoryProtocolCoreAddressManager.sol +++ b/script/utils/StoryProtocolCoreAddressManager.sol @@ -16,6 +16,8 @@ contract StoryProtocolCoreAddressManager is Script { address internal accessControllerAddr; address internal pilTemplateAddr; address internal licenseTokenAddr; + address internal groupingModuleAddr; + address internal groupNFTAddr; function _readStoryProtocolCoreAddresses() internal { string memory root = vm.projectRoot(); @@ -39,5 +41,7 @@ contract StoryProtocolCoreAddressManager is Script { accessControllerAddr = json.readAddress(".main.AccessController"); pilTemplateAddr = json.readAddress(".main.PILicenseTemplate"); licenseTokenAddr = json.readAddress(".main.LicenseToken"); + groupingModuleAddr = json.readAddress(".main.GroupingModule"); + groupNFTAddr = json.readAddress(".main.GroupNFT"); } }