0xZeroLabs · notxorand · Mar 6, 2025 · Feb 9, 2025 · Feb 9, 2025 · Feb 21, 2025
diff --git a/.env.example b/.env.example
@@ -1,3 +1,5 @@
 PRIVATE_KEY_DEPLOYER=
 L1_CHAIN=
 L2_CHAIN=
+OTHENTIC_BOOTSTRAP_SEED=
+OTHENTIC_BOOTSTRAP_ID=
diff --git a/execution/contracts/broadcast/ForgeRegistry.s.sol/1315/run-latest.json b/execution/contracts/broadcast/ForgeRegistry.s.sol/1315/run-latest.json
diff --git a/execution/contracts/foundry.toml b/execution/contracts/foundry.toml
@@ -5,7 +5,8 @@ cache_path  = 'forge-cache'
 gas_reports = ["*"]
 optimizer = true
 optimizer_runs = 20000
+via_ir = true
 test = 'test'
 solc = '0.8.26'
-fs_permissions = [{ access = 'read', path = './' }, { access = 'read-write', path = './deploy-out' }]
+fs_permissions = [{ access = 'read', path = './out' }, { access = 'read-write', path = './deploy-out' }]
 evm_version = 'cancun'
diff --git a/execution/contracts/package.json b/execution/contracts/package.json
@@ -1,13 +1,14 @@
 {
-	"dependencies": {
-		"@openzeppelin/contracts": "^5.1.0",
-		"@openzeppelin/contracts-upgradeable": "^5.1.0",
-		"@story-protocol/protocol-core": "github:storyprotocol/protocol-core-v1#v1.2.3",
-		"@story-protocol/protocol-periphery": "github:storyprotocol/protocol-periphery-v1#v1.2.4",
-		"erc6551": "^0.3.1"
-	},
-	"devDependencies": {
-		"ds-test": "github:dapphub/ds-test",
-		"forge-std": "github:foundry-rs/forge-std#v1.7.6"
-	}
+  "dependencies": {
+    "@openzeppelin/contracts": "^5.2.0",
+    "@openzeppelin/contracts-upgradeable": "^5.2.0",
+    "@story-protocol/protocol-core": "github:storyprotocol/protocol-core-v1#v1.3.1",
+    "@story-protocol/protocol-periphery": "github:storyprotocol/protocol-periphery-v1#v1.3.1",
+    "erc6551": "^0.3.1",
+    "solady": "^0.1.10"
+  },
+  "devDependencies": {
+    "ds-test": "github:dapphub/ds-test",
+    "forge-std": "github:foundry-rs/forge-std#v1.7.6"
+  }
 }
diff --git a/execution/contracts/pnpm-lock.yaml b/execution/contracts/pnpm-lock.yaml
diff --git a/execution/contracts/remappings.txt b/execution/contracts/remappings.txt
@@ -4,3 +4,5 @@
 erc6551/=node_modules/erc6551/
 forge-std/=node_modules/forge-std/src/
 ds-test/=node_modules/ds-test/src/
+@storyprotocol/test/=node_modules/@story-protocol/protocol-core/test/foundry/
+@solady/=node_modules/solady/
diff --git a/execution/contracts/script/ForgeRegistry.s.sol b/execution/contracts/script/ForgeRegistry.s.sol
@@ -18,12 +18,16 @@ contract DeployForgeRegistry is Script {
             ForgeRegistry.initialize.selector,
             vm.envAddress("IP_ASSET_REGISTRY_ADDRESS"),
             vm.envAddress("REGISTRATION_WORKFLOWS_ADDRESS"),
-            deployer
+            vm.envAddress("PILICENSE_TEMPLATE_ADDRESS"),
+            vm.envAddress("ROYALTY_POLICY_LAP_ADDRESS"),
+            vm.envAddress("LICENSING_MODULE_ADDRESS"),
+            deployer,
+            vm.envAddress("BATCHER_ADDRESS")
         );
 
         ERC1967Proxy proxy = new ERC1967Proxy(address(implementation), data);
 
-        ForgeRegistry(address(proxy));
+        ForgeRegistry(payable(address(proxy)));
 
         vm.stopBroadcast();
 
@@ -36,16 +40,27 @@ contract UpgradeForgeRegistry is Script {
     function run() external {
         uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
         address proxyAddress = vm.envAddress("PROXY_ADDRESS");
+        address deployer = vm.addr(deployerPrivateKey);
 
         vm.startBroadcast(deployerPrivateKey);
 
         // Deploy new implementation
         ForgeRegistry newImplementation = new ForgeRegistry();
 
-        // Upgrade
+        bytes memory data = abi.encodeWithSelector(
+            ForgeRegistry.reinitialize.selector,
+            vm.envAddress("IP_ASSET_REGISTRY_ADDRESS"),
+            vm.envAddress("REGISTRATION_WORKFLOWS_ADDRESS"),
+            vm.envAddress("PILICENSE_TEMPLATE_ADDRESS"),
+            vm.envAddress("ROYALTY_POLICY_LAP_ADDRESS"),
+            vm.envAddress("LICENSING_MODULE_ADDRESS"),
+            deployer,
+            vm.envAddress("BATCHER_ADDRESS")
+        );
+        // Upgrade and call the reinitializer
         UUPSUpgradeable(proxyAddress).upgradeToAndCall(
             address(newImplementation),
-            "" // No need to call initialize again
+            data
         );
 
         vm.stopBroadcast();