@croptop/core-v6 0.0.49 → 0.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@croptop/core-v6",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -29,17 +29,17 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'croptop-core-v6'"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.51",
-    "@bananapus/core-v6": "^0.0.54",
-    "@bananapus/ownable-v6": "^0.0.25",
+    "@bananapus/721-hook-v6": "^0.0.52",
+    "@bananapus/core-v6": "^0.0.55",
+    "@bananapus/ownable-v6": "^0.0.26",
     "@bananapus/permission-ids-v6": "^0.0.25",
-    "@bananapus/router-terminal-v6": "^0.0.44",
-    "@bananapus/suckers-v6": "^0.0.47",
+    "@bananapus/router-terminal-v6": "^0.0.45",
+    "@bananapus/suckers-v6": "^0.0.48",
     "@openzeppelin/contracts": "5.6.1",
-    "@rev-net/core-v6": "^0.0.56"
+    "@rev-net/core-v6": "^0.0.58"
   },
   "devDependencies": {
-    "@bananapus/address-registry-v6": "^0.0.25",
+    "@bananapus/address-registry-v6": "^0.0.26",
     "@sphinx-labs/plugins": "0.33.3"
   }
 }

package/script/ConfigureFeeProject.s.sol

@@ -8,18 +8,18 @@ import {
     RouterTerminalDeployment,
     RouterTerminalDeploymentLib
 } from "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
-import {
-    RevnetCoreDeployment,
-    RevnetCoreDeploymentLib
-} from "@rev-net/core-v6/script/helpers/RevnetCoreDeploymentLib.sol";
 import {CroptopDeployment, CroptopDeploymentLib} from "./helpers/CroptopDeploymentLib.sol";
 
+import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/contracts/foundry/SphinxConstants.sol";
 import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
-import {Script} from "forge-std/Script.sol";
+import {Script, stdJson} from "forge-std/Script.sol";
+import {Vm} from "forge-std/Vm.sol";
 
+import {IJB721TiersHook} from "@bananapus/721-hook-v6/src/interfaces/IJB721TiersHook.sol";
 import {IJB721TokenUriResolver} from "@bananapus/721-hook-v6/src/interfaces/IJB721TokenUriResolver.sol";
 import {JB721InitTiersConfig} from "@bananapus/721-hook-v6/src/structs/JB721InitTiersConfig.sol";
 import {JB721TierConfig} from "@bananapus/721-hook-v6/src/structs/JB721TierConfig.sol";
+import {IJBDirectory} from "@bananapus/core-v6/src/interfaces/IJBDirectory.sol";
 import {IJBSplitHook} from "@bananapus/core-v6/src/interfaces/IJBSplitHook.sol";
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
@@ -47,6 +47,74 @@ struct FeeProjectConfig {
     REVCroptopAllowedPost[] allowedPosts;
 }
 
+interface IREVDeployerForCroptopFeeProject {
+    function DIRECTORY() external view returns (IJBDirectory);
+
+    function deployFor(
+        uint256 revnetId,
+        REVConfig memory configuration,
+        JBTerminalConfig[] memory terminalConfigurations,
+        REVSuckerDeploymentConfig memory suckerDeploymentConfiguration,
+        REVDeploy721TiersHookConfig memory tiered721HookConfiguration,
+        REVCroptopAllowedPost[] memory allowedPosts
+    )
+        external
+        returns (uint256, IJB721TiersHook hook);
+}
+
+struct RevnetCoreDeployment {
+    IREVDeployerForCroptopFeeProject basicDeployer;
+}
+
+library RevnetCoreDeploymentLib {
+    address internal constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
+    // forge-lint: disable-next-line(screaming-snake-case-const)
+    Vm internal constant vm = Vm(VM_ADDRESS);
+
+    function getDeployment(string memory path) internal returns (RevnetCoreDeployment memory deployment) {
+        uint256 chainId = block.chainid;
+        SphinxConstants sphinxConstants = new SphinxConstants();
+        NetworkInfo[] memory networks = sphinxConstants.getNetworkInfoArray();
+
+        for (uint256 i; i < networks.length; i++) {
+            if (networks[i].chainId == chainId) return getDeployment({path: path, networkName: networks[i].name});
+        }
+
+        revert("ChainID is not (currently) supported by Sphinx.");
+    }
+
+    function getDeployment(
+        string memory path,
+        string memory networkName
+    )
+        internal
+        view
+        returns (RevnetCoreDeployment memory deployment)
+    {
+        deployment.basicDeployer = IREVDeployerForCroptopFeeProject(
+            _getDeploymentAddress({
+                path: path, projectName: "revnet-core-v6", networkName: networkName, contractName: "REVDeployer"
+            })
+        );
+    }
+
+    function _getDeploymentAddress(
+        string memory path,
+        string memory projectName,
+        string memory networkName,
+        string memory contractName
+    )
+        private
+        view
+        returns (address)
+    {
+        string memory deploymentJson =
+        // forge-lint: disable-next-line(unsafe-cheatcode)
+        vm.readFile(string.concat(path, projectName, "/", networkName, "/", contractName, ".json"));
+        return stdJson.readAddress({json: deploymentJson, key: ".address"});
+    }
+}
+
 contract ConfigureFeeProjectScript is Script, Sphinx {
     /// @notice tracks the deployment of the core contracts for the chain we are deploying to.
     CoreDeployment core;
@@ -118,7 +186,7 @@ contract ConfigureFeeProjectScript is Script, Sphinx {
         );
 
         // We do a quick sanity check to make sure revnet and croptop use the same juicebox core contracts.
-        require(revnet.basic_deployer.DIRECTORY() == croptop.publisher.DIRECTORY());
+        require(revnet.basicDeployer.DIRECTORY() == croptop.publisher.DIRECTORY());
 
         // Set the operator address to be the multisig.
         operator = safeAddress();
@@ -338,10 +406,10 @@ contract ConfigureFeeProjectScript is Script, Sphinx {
         // Only deploy if the project hasn't already been configured (restart-safe).
         if (address(core.directory.controllerOf(feeProjectId)) == address(0)) {
             // Approve the basic deployer to configure the project and transfer it.
-            core.projects.approve({to: address(revnet.basic_deployer), tokenId: feeProjectId});
+            core.projects.approve({to: address(revnet.basicDeployer), tokenId: feeProjectId});
 
             // Deploy the NANA fee project.
-            revnet.basic_deployer
+            revnet.basicDeployer
                 .deployFor({
                     revnetId: feeProjectId,
                     configuration: feeProjectConfig.configuration,

package/script/Deploy.s.sol

@@ -90,7 +90,7 @@ contract DeployScript is Script, Sphinx {
                 salt: _DEPLOYER_SALT,
                 creationCode: type(CTDeployer).creationCode,
                 arguments: abi.encode(
-                    core.permissions, core.projects, hook.hook_deployer, publisher, suckers.registry, trustedForwarder
+                    core.permissions, core.projects, hook.hookDeployer, publisher, suckers.registry, trustedForwarder
                 )
             });
 
@@ -99,7 +99,7 @@ contract DeployScript is Script, Sphinx {
                 ? new CTDeployer{salt: _DEPLOYER_SALT}({
                     permissions: core.permissions,
                     projects: core.projects,
-                    deployer: hook.hook_deployer,
+                    deployer: hook.hookDeployer,
                     publisher: publisher,
                     suckerRegistry: suckers.registry,
                     trustedForwarder: trustedForwarder

package/src/CTDeployer.sol

@@ -131,7 +131,7 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
     /// @param hook The hook to claim ownership of.
     function claimCollectionOwnershipOf(IJB721TiersHook hook) external override {
         // Get the project ID of the hook.
-        uint256 projectId = hook.PROJECT_ID();
+        uint256 projectId = hook.projectId();
 
         // Keep a reference to the caller.
         address caller = _msgSender();

package/src/CTPublisher.sol

@@ -136,7 +136,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
             // Enforce permissions.
             _requirePermissionFrom({
                 account: JBOwnable(allowedPost.hook).owner(),
-                projectId: IJB721TiersHook(allowedPost.hook).PROJECT_ID(),
+                projectId: IJB721TiersHook(allowedPost.hook).projectId(),
                 permissionId: JBPermissionIds.ADJUST_721_TIERS
             });
 
@@ -214,7 +214,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
         bytes memory mintMetadata;
 
         // Keep a reference to the project's ID.
-        uint256 projectId = hook.PROJECT_ID();
+        uint256 projectId = hook.projectId();
 
         {
             // Setup the posts.
@@ -487,7 +487,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
                         store.tierOf({hook: address(hook), id: tierId, includeResolvedUri: false});
                     if (
                         store.isTierRemoved({hook: address(hook), tierId: tierId})
-                            || cachedTier.encodedIPFSUri != post.encodedIpfsUri
+                            || cachedTier.encodedIpfsUri != post.encodedIpfsUri
                     ) {
                         delete tierIdForEncodedIpfsUriOf[address(hook)][post.encodedIpfsUri];
                     } else {
@@ -559,7 +559,7 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
                     votingUnits: 0,
                     reserveFrequency: 0,
                     reserveBeneficiary: address(0),
-                    encodedIPFSUri: post.encodedIpfsUri,
+                    encodedIpfsUri: post.encodedIpfsUri,
                     category: post.category,
                     discountPercent: 0,
                     flags: JB721TierConfigFlags({