@croptop/core-v6 0.0.56 → 0.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@croptop/core-v6",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@bananapus/721-hook-v6": "^0.0.55",
-    "@bananapus/core-v6": "^0.0.60",
+    "@bananapus/core-v6": "^0.0.64",
     "@bananapus/ownable-v6": "^0.0.28",
     "@bananapus/permission-ids-v6": "^0.0.27",
     "@bananapus/router-terminal-v6": "^0.0.49",

package/script/ConfigureFeeProject.s.sol

@@ -2,13 +2,13 @@
 pragma solidity 0.8.28;
 
 import {Hook721Deployment, Hook721DeploymentLib} from "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
-import {CoreDeployment, CoreDeploymentLib} from "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
 import {SuckerDeployment, SuckerDeploymentLib} from "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
 import {
     RouterTerminalDeployment,
     RouterTerminalDeploymentLib
 } from "@bananapus/router-terminal-v6/script/helpers/RouterTerminalDeploymentLib.sol";
 import {CroptopDeployment, CroptopDeploymentLib} from "./helpers/CroptopDeploymentLib.sol";
+import {CoreDeployment, CoreDeploymentLib} from "./helpers/CoreDeploymentLib.sol";
 
 import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/contracts/foundry/SphinxConstants.sol";
 import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";

package/script/Deploy.s.sol

@@ -2,7 +2,6 @@
 pragma solidity 0.8.28;
 
 import {Hook721Deployment, Hook721DeploymentLib} from "@bananapus/721-hook-v6/script/helpers/Hook721DeploymentLib.sol";
-import {CoreDeployment, CoreDeploymentLib} from "@bananapus/core-v6/script/helpers/CoreDeploymentLib.sol";
 import {SuckerDeployment, SuckerDeploymentLib} from "@bananapus/suckers-v6/script/helpers/SuckerDeploymentLib.sol";
 
 import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
@@ -11,6 +10,7 @@ import {Script} from "forge-std/Script.sol";
 import {CTDeployer} from "./../src/CTDeployer.sol";
 import {CTProjectOwner} from "./../src/CTProjectOwner.sol";
 import {CTPublisher} from "./../src/CTPublisher.sol";
+import {CoreDeployment, CoreDeploymentLib} from "./helpers/CoreDeploymentLib.sol";
 
 contract DeployScript is Script, Sphinx {
     /// @notice tracks the deployment of the core contracts for the chain we are deploying to.

package/script/helpers/CoreDeploymentLib.sol

@@ -0,0 +1,172 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.28;
+
+import {stdJson} from "forge-std/Script.sol";
+import {Vm} from "forge-std/Vm.sol";
+
+import {JBController} from "@bananapus/core-v6/src/JBController.sol";
+import {JBDirectory} from "@bananapus/core-v6/src/JBDirectory.sol";
+import {JBFeelessAddresses} from "@bananapus/core-v6/src/JBFeelessAddresses.sol";
+import {JBFundAccessLimits} from "@bananapus/core-v6/src/JBFundAccessLimits.sol";
+import {JBMultiTerminal} from "@bananapus/core-v6/src/JBMultiTerminal.sol";
+import {JBPermissions} from "@bananapus/core-v6/src/JBPermissions.sol";
+import {JBPrices} from "@bananapus/core-v6/src/JBPrices.sol";
+import {JBProjects} from "@bananapus/core-v6/src/JBProjects.sol";
+import {JBRulesets} from "@bananapus/core-v6/src/JBRulesets.sol";
+import {JBSplits} from "@bananapus/core-v6/src/JBSplits.sol";
+import {JBTerminalStore} from "@bananapus/core-v6/src/JBTerminalStore.sol";
+import {JBTokens} from "@bananapus/core-v6/src/JBTokens.sol";
+
+import {SphinxConstants, NetworkInfo} from "@sphinx-labs/contracts/contracts/foundry/SphinxConstants.sol";
+
+struct CoreDeployment {
+    JBPermissions permissions;
+    JBProjects projects;
+    JBDirectory directory;
+    JBSplits splits;
+    JBRulesets rulesets;
+    JBController controller;
+    JBMultiTerminal terminal;
+    JBTerminalStore terminalStore;
+    JBPrices prices;
+    JBFeelessAddresses feeless;
+    JBFundAccessLimits fundAccess;
+    JBTokens tokens;
+    address trustedForwarder;
+}
+
+library CoreDeploymentLib {
+    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);
+    string internal constant PROJECT_NAME = "nana-core-v6";
+
+    function getDeployment(string memory path) internal returns (CoreDeployment 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
+        returns (CoreDeployment memory deployment)
+    {
+        deployment.permissions = JBPermissions(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBPermissions"
+            })
+        );
+
+        deployment.projects = JBProjects(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBProjects"
+            })
+        );
+
+        deployment.directory = JBDirectory(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBDirectory"
+            })
+        );
+
+        deployment.splits = JBSplits(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBSplits"
+            })
+        );
+
+        deployment.rulesets = JBRulesets(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBRulesets"
+            })
+        );
+
+        deployment.controller = JBController(
+            _tryGetDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBController"
+            })
+        );
+
+        deployment.terminal = JBMultiTerminal(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBMultiTerminal"
+            })
+        );
+
+        deployment.terminalStore = JBTerminalStore(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBTerminalStore"
+            })
+        );
+
+        deployment.prices = JBPrices(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBPrices"
+            })
+        );
+
+        deployment.feeless = JBFeelessAddresses(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBFeelessAddresses"
+            })
+        );
+
+        deployment.fundAccess = JBFundAccessLimits(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBFundAccessLimits"
+            })
+        );
+
+        deployment.tokens = JBTokens(
+            _getDeploymentAddress({
+                path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "JBTokens"
+            })
+        );
+
+        deployment.trustedForwarder = _getDeploymentAddress({
+            path: path, projectName: PROJECT_NAME, networkName: networkName, contractName: "ERC2771Forwarder"
+        });
+    }
+
+    function _getDeploymentAddress(
+        string memory path,
+        string memory projectName,
+        string memory networkName,
+        string memory contractName
+    )
+        internal
+        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"});
+    }
+
+    function _tryGetDeploymentAddress(
+        string memory path,
+        string memory projectName,
+        string memory networkName,
+        string memory contractName
+    )
+        internal
+        returns (address)
+    {
+        string memory filePath = string.concat(path, projectName, "/", networkName, "/", contractName, ".json");
+        // forge-lint: disable-next-line(unsafe-cheatcode)
+        if (!vm.exists(filePath)) return address(0);
+        // forge-lint: disable-next-line(unsafe-cheatcode)
+        return stdJson.readAddress({json: vm.readFile(filePath), key: ".address"});
+    }
+}

package/src/CTDeployer.sol

@@ -51,7 +51,14 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
     // ---------------------------- events -------------------------------- //
     //*********************************************************************//
 
-    event CTDeployer_SuckerDeploymentFailed(uint256 indexed projectId, bytes32 indexed salt, bytes reason);
+    /// @notice Emitted when launch-time sucker deployment fails without reverting the collection launch.
+    /// @param projectId The project whose sucker deployment failed.
+    /// @param salt The salt used for the failed sucker deployment attempt.
+    /// @param reason The revert reason returned by the sucker registry.
+    /// @param caller The address that launched the project.
+    event CTDeployer_SuckerDeploymentFailed(
+        uint256 indexed projectId, bytes32 indexed salt, bytes reason, address caller
+    );
 
     //*********************************************************************//
     // ---------------- public immutable stored properties --------------- //
@@ -177,6 +184,7 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
         IJBController controller
     )
         external
+        payable
         override
         returns (uint256 projectId, IJB721TiersHook hook)
     {
@@ -187,7 +195,7 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
         rulesetConfigurations[0].metadata.baseCurrency = JBCurrencyIds.ETH;
 
         // Reserve the project ID up front so permissionless project creations cannot invalidate hook deployment.
-        projectId = PROJECTS.createFor(address(this));
+        projectId = PROJECTS.createFor{value: msg.value}(address(this));
 
         // Deploy a blank project.
         hook = DEPLOYER.deployHookFor({
@@ -259,7 +267,9 @@ contract CTDeployer is ERC2771Context, JBPermissioned, IJBRulesetDataHook, IERC7
             // no-op
             }
             catch (bytes memory reason) {
-                emit CTDeployer_SuckerDeploymentFailed({projectId: projectId, salt: suckerSalt, reason: reason});
+                emit CTDeployer_SuckerDeploymentFailed({
+                    projectId: projectId, salt: suckerSalt, reason: reason, caller: _msgSender()
+                });
             }
         }
 

package/src/interfaces/ICTDeployer.sol

@@ -43,6 +43,7 @@ interface ICTDeployer {
         IJBController controller
     )
         external
+        payable
         returns (uint256 projectId, IJB721TiersHook hook);
 
     /// @notice Deploy new suckers for an existing project.