@bananapus/core-v6 0.0.15 → 0.0.17

package/script/Deploy.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
+import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
 import {Script} from "forge-std/Script.sol";
 
 import {IPermit2} from "@uniswap/permit2/src/interfaces/IPermit2.sol";
@@ -26,16 +26,20 @@ contract Deploy is Script, Sphinx {
 
     /// @notice The address that is allowed to forward calls to the terminal and controller on a users behalf.
     string private constant TRUSTED_FORWARDER_NAME = "Juicebox";
+    // forge-lint: disable-next-line(mixed-case-variable)
     address private TRUSTED_FORWARDER;
 
     /// @notice The address that will manage the few privileged functions of the protocol.
+    // forge-lint: disable-next-line(mixed-case-variable)
     address private MANAGER;
 
     /// @notice The address that will own the fee-project.
+    // forge-lint: disable-next-line(mixed-case-variable)
     address private FEE_PROJECT_OWNER;
 
     /// @notice The nonce that gets used across all chains to sync deployment addresses and allow for new deployments of
     /// the same bytecode.
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 private CORE_DEPLOYMENT_NONCE = 6;
 
     function configureSphinx() public override {
@@ -61,19 +65,24 @@ contract Deploy is Script, Sphinx {
 
         JBPermissions permissions =
             new JBPermissions{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}(TRUSTED_FORWARDER);
-        JBProjects projects = new JBProjects{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}(
-            safeAddress(), safeAddress(), TRUSTED_FORWARDER
-        );
-        JBDirectory directory =
-            new JBDirectory{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}(permissions, projects, safeAddress());
+        JBProjects projects = new JBProjects{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}({
+            owner: safeAddress(), feeProjectOwner: safeAddress(), trustedForwarder: TRUSTED_FORWARDER
+        });
+        JBDirectory directory = new JBDirectory{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}({
+            permissions: permissions, projects: projects, owner: safeAddress()
+        });
         JBSplits splits = new JBSplits{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}(directory);
         JBRulesets rulesets = new JBRulesets{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}(directory);
-        JBPrices prices = new JBPrices{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}(
-            directory, permissions, projects, safeAddress(), TRUSTED_FORWARDER
-        );
-        JBTokens tokens = new JBTokens{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}(
-            directory, new JBERC20{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}()
-        );
+        JBPrices prices = new JBPrices{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}({
+            directory: directory,
+            permissions: permissions,
+            projects: projects,
+            owner: safeAddress(),
+            trustedForwarder: TRUSTED_FORWARDER
+        });
+        JBTokens tokens = new JBTokens{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}({
+            directory: directory, token: new JBERC20{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}()
+        });
 
         new JBFundAccessLimits{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}(directory);
 
@@ -103,7 +112,7 @@ contract Deploy is Script, Sphinx {
 
         // Transfer ownership to the fee project owner.
         if (FEE_PROJECT_OWNER != safeAddress() && FEE_PROJECT_OWNER != address(0)) {
-            projects.safeTransferFrom(safeAddress(), FEE_PROJECT_OWNER, 1);
+            projects.safeTransferFrom({from: safeAddress(), to: FEE_PROJECT_OWNER, tokenId: 1});
         }
     }
 }

package/script/DeployPeriphery.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.26;
 
-import "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
+import {Sphinx} from "@sphinx-labs/contracts/contracts/foundry/SphinxPlugin.sol";
 import {Script} from "forge-std/Script.sol";
 import {CoreDeployment, CoreDeploymentLib} from "./helpers/CoreDeploymentLib.sol";
 
@@ -23,13 +23,17 @@ contract DeployPeriphery is Script, Sphinx {
     /// @notice tracks the deployment of the core contracts for the chain we are deploying to.
     CoreDeployment core;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     address private TRUSTED_FORWARDER;
 
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 private DEADLINES_SALT = keccak256("_JBDeadlinesV6_");
+    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 private USD_NATIVE_FEED_SALT = keccak256("USD_FEEDV6");
 
     /// @notice The nonce that gets used across all chains to sync deployment addresses and allow for new deployments of
     /// the same bytecode.
+    // forge-lint: disable-next-line(mixed-case-variable)
     uint256 private CORE_DEPLOYMENT_NONCE = 6;
 
     /// @notice The address of the omnichain ruleset operator contract (e.g. JBOmnichainDeployer).
@@ -39,6 +43,7 @@ contract DeployPeriphery is Script, Sphinx {
     /// @dev This address should correspond to the deterministic CREATE2 deployment of the omnichain deployer contract
     /// from the nana-omnichain-deployers-v6 repository. Verify it matches the deployed address on all target chains
     /// before running this script.
+    // forge-lint: disable-next-line(mixed-case-variable)
     address private OMNICHAIN_RULESET_OPERATOR = address(0x8f5DED85c40b50d223269C1F922A056E72101590);
 
     function configureSphinx() public override {
@@ -71,6 +76,7 @@ contract DeployPeriphery is Script, Sphinx {
         matchingPriceFeed = new JBMatchingPriceFeed();
 
         // Same as the chainlink example grace period.
+        // forge-lint: disable-next-line(mixed-case-variable)
         uint256 L2GracePeriod = 3600 seconds;
 
         // NOTE: Feeds come from this url `https://data.chain.link/feeds/ethereum/mainnet/eth-usd`.
@@ -78,13 +84,15 @@ contract DeployPeriphery is Script, Sphinx {
 
         // Perform the deploy for L1(s).
         if (block.chainid == 1) {
-            feed = new JBChainlinkV3PriceFeed{salt: USD_NATIVE_FEED_SALT}(
-                AggregatorV3Interface(address(0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419)), 3600 seconds
-            );
+            feed = new JBChainlinkV3PriceFeed{salt: USD_NATIVE_FEED_SALT}({
+                feed: AggregatorV3Interface(address(0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419)),
+                threshold: 3600 seconds
+            });
         } else if (block.chainid == 11_155_111) {
-            feed = new JBChainlinkV3PriceFeed{salt: USD_NATIVE_FEED_SALT}(
-                AggregatorV3Interface(address(0x694AA1769357215DE4FAC081bf1f309aDC325306)), 3600 seconds
-            );
+            feed = new JBChainlinkV3PriceFeed{salt: USD_NATIVE_FEED_SALT}({
+                feed: AggregatorV3Interface(address(0x694AA1769357215DE4FAC081bf1f309aDC325306)),
+                threshold: 3600 seconds
+            });
         } else {
             // Perform the deploy for L2s
             AggregatorV3Interface source;
@@ -92,47 +100,47 @@ contract DeployPeriphery is Script, Sphinx {
             // Optimism
             if (block.chainid == 10) {
                 source = AggregatorV3Interface(0x13e3Ee699D1909E989722E753853AE30b17e08c5);
-                feed = new JBChainlinkV3SequencerPriceFeed{salt: USD_NATIVE_FEED_SALT}(
-                    source,
-                    3600 seconds,
-                    AggregatorV2V3Interface(0x371EAD81c9102C9BF4874A9075FFFf170F2Ee389),
-                    L2GracePeriod
-                );
+                feed = new JBChainlinkV3SequencerPriceFeed{salt: USD_NATIVE_FEED_SALT}({
+                    feed: source,
+                    threshold: 3600 seconds,
+                    sequencerFeed: AggregatorV2V3Interface(0x371EAD81c9102C9BF4874A9075FFFf170F2Ee389),
+                    gracePeriod: L2GracePeriod
+                });
             }
             // Optimism Sepolia
             else if (block.chainid == 11_155_420) {
                 source = AggregatorV3Interface(address(0x61Ec26aA57019C486B10502285c5A3D4A4750AD7));
-                feed = new JBChainlinkV3PriceFeed{salt: USD_NATIVE_FEED_SALT}(source, 3600 seconds);
+                feed = new JBChainlinkV3PriceFeed{salt: USD_NATIVE_FEED_SALT}({feed: source, threshold: 3600 seconds});
             }
             // Base
             else if (block.chainid == 8453) {
                 source = AggregatorV3Interface(0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70);
-                feed = new JBChainlinkV3SequencerPriceFeed{salt: USD_NATIVE_FEED_SALT}(
-                    source,
-                    3600 seconds,
-                    AggregatorV2V3Interface(0xBCF85224fc0756B9Fa45aA7892530B47e10b6433),
-                    L2GracePeriod
-                );
+                feed = new JBChainlinkV3SequencerPriceFeed{salt: USD_NATIVE_FEED_SALT}({
+                    feed: source,
+                    threshold: 3600 seconds,
+                    sequencerFeed: AggregatorV2V3Interface(0xBCF85224fc0756B9Fa45aA7892530B47e10b6433),
+                    gracePeriod: L2GracePeriod
+                });
             }
             // Base Sepolia
             else if (block.chainid == 84_532) {
                 source = AggregatorV3Interface(address(0x4aDC67696bA383F43DD60A9e78F2C97Fbbfc7cb1));
-                feed = new JBChainlinkV3PriceFeed{salt: USD_NATIVE_FEED_SALT}(source, 3600 seconds);
+                feed = new JBChainlinkV3PriceFeed{salt: USD_NATIVE_FEED_SALT}({feed: source, threshold: 3600 seconds});
             }
             // Arbitrum
             else if (block.chainid == 42_161) {
                 source = AggregatorV3Interface(0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612);
-                feed = new JBChainlinkV3SequencerPriceFeed{salt: USD_NATIVE_FEED_SALT}(
-                    source,
-                    3600 seconds,
-                    AggregatorV2V3Interface(0xFdB631F5EE196F0ed6FAa767959853A9F217697D),
-                    L2GracePeriod
-                );
+                feed = new JBChainlinkV3SequencerPriceFeed{salt: USD_NATIVE_FEED_SALT}({
+                    feed: source,
+                    threshold: 3600 seconds,
+                    sequencerFeed: AggregatorV2V3Interface(0xFdB631F5EE196F0ed6FAa767959853A9F217697D),
+                    gracePeriod: L2GracePeriod
+                });
             }
             // Arbitrum Sepolia
             else if (block.chainid == 421_614) {
                 source = AggregatorV3Interface(address(0xd30e2101a97dcbAeBCBC04F14C3f624E67A35165));
-                feed = new JBChainlinkV3PriceFeed{salt: USD_NATIVE_FEED_SALT}(source, 3600 seconds);
+                feed = new JBChainlinkV3PriceFeed{salt: USD_NATIVE_FEED_SALT}({feed: source, threshold: 3600 seconds});
             } else {
                 revert("Unsupported chain");
             }
@@ -169,25 +177,25 @@ contract DeployPeriphery is Script, Sphinx {
         _deployUSDCFeed(L2GracePeriod);
 
         // Deploy the JBDeadlines
-        if (!_isDeployed(DEADLINES_SALT, type(JBDeadline3Hours).creationCode, "")) {
+        if (!_isDeployed({salt: DEADLINES_SALT, creationCode: type(JBDeadline3Hours).creationCode, arguments: ""})) {
             new JBDeadline3Hours{salt: DEADLINES_SALT}();
         }
 
-        if (!_isDeployed(DEADLINES_SALT, type(JBDeadline1Day).creationCode, "")) {
+        if (!_isDeployed({salt: DEADLINES_SALT, creationCode: type(JBDeadline1Day).creationCode, arguments: ""})) {
             new JBDeadline1Day{salt: DEADLINES_SALT}();
         }
 
-        if (!_isDeployed(DEADLINES_SALT, type(JBDeadline3Days).creationCode, "")) {
+        if (!_isDeployed({salt: DEADLINES_SALT, creationCode: type(JBDeadline3Days).creationCode, arguments: ""})) {
             new JBDeadline3Days{salt: DEADLINES_SALT}();
         }
 
-        if (!_isDeployed(DEADLINES_SALT, type(JBDeadline7Days).creationCode, "")) {
+        if (!_isDeployed({salt: DEADLINES_SALT, creationCode: type(JBDeadline7Days).creationCode, arguments: ""})) {
             new JBDeadline7Days{salt: DEADLINES_SALT}();
         }
 
         core.directory
-            .setIsAllowedToSetFirstController(
-                address(
+            .setIsAllowedToSetFirstController({
+                addr: address(
                     new JBController{salt: keccak256(abi.encode(CORE_DEPLOYMENT_NONCE))}({
                         directory: core.directory,
                         fundAccessLimits: core.fundAccess,
@@ -201,24 +209,27 @@ contract DeployPeriphery is Script, Sphinx {
                         trustedForwarder: TRUSTED_FORWARDER
                     })
                 ),
-                true
-            );
+                flag: true
+            });
     }
 
+    // forge-lint: disable-next-line(mixed-case-function, mixed-case-variable)
     function _deployUSDCFeed(uint256 L2GracePeriod) internal {
         IJBPriceFeed usdcFeed;
         address usdc;
 
         if (block.chainid == 1) {
             usdc = address(0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48);
-            usdcFeed = new JBChainlinkV3PriceFeed(
-                AggregatorV3Interface(address(0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6)), 86_400 seconds
-            );
+            usdcFeed = new JBChainlinkV3PriceFeed({
+                feed: AggregatorV3Interface(address(0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6)),
+                threshold: 86_400 seconds
+            });
         } else if (block.chainid == 11_155_111) {
             usdc = address(0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238);
-            usdcFeed = new JBChainlinkV3PriceFeed(
-                AggregatorV3Interface(address(0xA2F78ab2355fe2f984D808B5CeE7FD0A93D5270E)), 86_400 seconds
-            );
+            usdcFeed = new JBChainlinkV3PriceFeed({
+                feed: AggregatorV3Interface(address(0xA2F78ab2355fe2f984D808B5CeE7FD0A93D5270E)),
+                threshold: 86_400 seconds
+            });
         } else if (block.chainid == 10) {
             usdc = address(0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85);
             usdcFeed = new JBChainlinkV3SequencerPriceFeed({
@@ -229,9 +240,10 @@ contract DeployPeriphery is Script, Sphinx {
             });
         } else if (block.chainid == 11_155_420) {
             usdc = address(0x5fd84259d66Cd46123540766Be93DFE6D43130D7);
-            usdcFeed = new JBChainlinkV3PriceFeed(
-                AggregatorV3Interface(address(0x6e44e50E3cc14DD16e01C590DC1d7020cb36eD4C)), 86_400 seconds
-            );
+            usdcFeed = new JBChainlinkV3PriceFeed({
+                feed: AggregatorV3Interface(address(0x6e44e50E3cc14DD16e01C590DC1d7020cb36eD4C)),
+                threshold: 86_400 seconds
+            });
         } else if (block.chainid == 8453) {
             usdc = address(0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913);
             usdcFeed = new JBChainlinkV3SequencerPriceFeed({
@@ -242,9 +254,13 @@ contract DeployPeriphery is Script, Sphinx {
             });
         } else if (block.chainid == 84_532) {
             usdc = address(0x036CbD53842c5426634e7929541eC2318f3dCF7e);
-            usdcFeed = new JBChainlinkV3PriceFeed(
-                AggregatorV3Interface(address(0xd30e2101a97dcbAeBCBC04F14C3f624E67A35165)), 86_400 seconds
-            );
+            // TODO: Verify this feed address — 0xd30e2101... is the Arbitrum Sepolia ETH/USD feed and is likely
+            // incorrect for Base Sepolia USDC/USD. Replace with the correct Chainlink Base Sepolia USDC/USD address
+            // before deploying. Testnet-only; does not affect mainnet deployments.
+            usdcFeed = new JBChainlinkV3PriceFeed({
+                feed: AggregatorV3Interface(address(0xd30e2101a97dcbAeBCBC04F14C3f624E67A35165)),
+                threshold: 86_400 seconds
+            });
         } else if (block.chainid == 42_161) {
             usdc = address(0xaf88d065e77c8cC2239327C5EDb3A432268e5831);
             usdcFeed = new JBChainlinkV3SequencerPriceFeed({
@@ -255,9 +271,10 @@ contract DeployPeriphery is Script, Sphinx {
             });
         } else if (block.chainid == 421_614) {
             usdc = address(0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d);
-            usdcFeed = new JBChainlinkV3PriceFeed(
-                AggregatorV3Interface(address(0x0153002d20B96532C639313c2d54c3dA09109309)), 86_400 seconds
-            );
+            usdcFeed = new JBChainlinkV3PriceFeed({
+                feed: AggregatorV3Interface(address(0x0153002d20B96532C639313c2d54c3dA09109309)),
+                threshold: 86_400 seconds
+            });
         } else {
             revert("Unsupported chain for USDC feed");
         }
@@ -267,10 +284,17 @@ contract DeployPeriphery is Script, Sphinx {
 
         core.prices
             .addPriceFeedFor({
-                projectId: 0, pricingCurrency: JBCurrencyIds.USD, unitCurrency: uint32(uint160(usdc)), feed: usdcFeed
+                projectId: 0,
+                pricingCurrency: JBCurrencyIds.USD,
+                // forge-lint: disable-next-line(unsafe-typecast)
+                unitCurrency: uint32(uint160(usdc)),
+                feed: usdcFeed
             });
     }
 
+    /// @dev This helper predicts addresses using the Arachnid CREATE2 deployer, but actual deployments go through
+    /// Sphinx (which uses a different deployer). As a result, this guard will never detect Sphinx-deployed contracts
+    /// and is only effective for contracts deployed via the Arachnid deployer directly.
     function _isDeployed(bytes32 salt, bytes memory creationCode, bytes memory arguments) internal view returns (bool) {
         address _deployedTo = vm.computeCreate2Address({
             salt: salt,

package/script/helpers/CoreDeploymentLib.sol

@@ -38,6 +38,7 @@ struct CoreDeployment {
 library CoreDeploymentLib {
     // Cheat code address, 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D.
     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 constant PROJECT_NAME = "nana-core-v5";
 
@@ -52,7 +53,7 @@ library CoreDeploymentLib {
 
         for (uint256 _i; _i < networks.length; _i++) {
             if (networks[_i].chainId == chainId) {
-                return getDeployment(path, networks[_i].name);
+                return getDeployment({path: path, networkName: networks[_i].name});
             }
         }
 
@@ -61,41 +62,87 @@ library CoreDeploymentLib {
 
     function getDeployment(
         string memory path,
-        string memory network_name
+        string memory networkName
     )
         internal
         view
         returns (CoreDeployment memory deployment)
     {
-        deployment.permissions = JBPermissions(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBPermissions"));
-
-        deployment.projects = JBProjects(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBProjects"));
-
-        deployment.directory = JBDirectory(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBDirectory"));
-
-        deployment.splits = JBSplits(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBSplits"));
-
-        deployment.rulesets = JBRulesets(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBRulesets"));
-
-        deployment.controller = JBController(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBController"));
-
-        deployment.terminal =
-            JBMultiTerminal(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBMultiTerminal"));
-
-        deployment.terminalStore =
-            JBTerminalStore(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBTerminalStore"));
-
-        deployment.prices = JBPrices(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBPrices"));
-
-        deployment.feeless =
-            JBFeelessAddresses(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBFeelessAddresses"));
-
-        deployment.fundAccess =
-            JBFundAccessLimits(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBFundAccessLimits"));
-
-        deployment.tokens = JBTokens(_getDeploymentAddress(path, PROJECT_NAME, network_name, "JBTokens"));
-
-        deployment.trustedForwarder = _getDeploymentAddress(path, PROJECT_NAME, network_name, "ERC2771Forwarder");
+        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(
+            _getDeploymentAddress({
+                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"
+        });
     }
 
     /// @notice Get the address of a contract that was deployed by the Deploy script.
@@ -105,8 +152,8 @@ library CoreDeploymentLib {
     /// @return The address of the contract.
     function _getDeploymentAddress(
         string memory path,
-        string memory project_name,
-        string memory network_name,
+        string memory projectName,
+        string memory networkName,
         string memory contractName
     )
         internal
@@ -114,7 +161,8 @@ library CoreDeploymentLib {
         returns (address)
     {
         string memory deploymentJson =
-            vm.readFile(string.concat(path, project_name, "/", network_name, "/", contractName, ".json"));
-        return stdJson.readAddress(deploymentJson, ".address");
+        // forge-lint: disable-next-line(unsafe-cheatcode)
+        vm.readFile(string.concat(path, projectName, "/", networkName, "/", contractName, ".json"));
+        return stdJson.readAddress({json: deploymentJson, key: ".address"});
     }
 }

package/src/JBChainlinkV3PriceFeed.sol

@@ -68,6 +68,7 @@ contract JBChainlinkV3PriceFeed is IJBPriceFeed {
         uint256 feedDecimals = FEED.decimals();
 
         // Return the price, adjusted to the specified number of decimals.
+        // forge-lint: disable-next-line(unsafe-typecast)
         return uint256(price).adjustDecimals({decimals: feedDecimals, targetDecimals: decimals});
     }
 }

package/src/JBController.sol

@@ -95,6 +95,11 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
     IJBTokens public immutable override TOKENS;
 
     /// @notice The address of the contract that manages omnichain ruleset ops.
+    /// @dev This is a deterministic CREATE2 deployment; bytecode verification at runtime would add
+    /// gas
+    /// cost for marginal security benefit since the address is verified at deploy time.
+    /// @dev Trust assumption is bounded: the operator can only queue rulesets that the omnichain
+    /// deployer's logic permits. It cannot drain funds or bypass access controls.
     address public immutable override OMNICHAIN_RULESET_OPERATOR;
 
     //*********************************************************************//
@@ -336,7 +341,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         require(msg.sender == address(this));
 
         // Approve the tokens being paid.
-        IERC20(address(token)).forceApprove(address(terminal), splitTokenCount);
+        IERC20(address(token)).forceApprove({spender: address(terminal), value: splitTokenCount});
 
         // slither-disable-next-line unused-return
         terminal.pay({
@@ -350,7 +355,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         });
 
         // Make sure that the terminal received the tokens.
-        if (IERC20(address(token)).allowance(address(this), address(terminal)) != 0) {
+        if (IERC20(address(token)).allowance({owner: address(this), spender: address(terminal)}) != 0) {
             revert JBController_TerminalTokensNotTransferred();
         }
     }
@@ -646,6 +651,21 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
         TOKENS.setTokenFor({projectId: projectId, token: token});
     }
 
+    /// @notice Sets the name and symbol of a project's token.
+    /// @dev Can only be called by the project's owner or an address with the owner's permission to
+    /// `SET_TOKEN_METADATA`.
+    /// @param projectId The ID of the project whose token is being updated.
+    /// @param name The new name.
+    /// @param symbol The new symbol.
+    function setTokenMetadataOf(uint256 projectId, string calldata name, string calldata symbol) external override {
+        // Enforce permissions.
+        _requirePermissionFrom({
+            account: PROJECTS.ownerOf(projectId), projectId: projectId, permissionId: JBPermissionIds.SET_TOKEN_METADATA
+        });
+
+        TOKENS.setTokenMetadataFor({projectId: projectId, name: name, symbol: symbol});
+    }
+
     /// @notice Set a project's metadata URI.
     /// @dev This is typically an IPFS hash, optionally with an `ipfs://` prefix.
     /// @dev Can only be called by the project's owner or an address with the owner's permission to
@@ -1026,7 +1046,7 @@ contract JBController is JBPermissioned, ERC2771Context, IJBController, IJBMigra
                                 });
 
                                 // If it fails, transfer the tokens from this contract to the beneficiary.
-                                IERC20(address(token)).safeTransfer(beneficiary, splitTokenCount);
+                                IERC20(address(token)).safeTransfer({to: beneficiary, value: splitTokenCount});
                             }
                         }
                     } else if (beneficiary == address(0xdead)) {

package/src/JBDeadline.sol

@@ -11,6 +11,9 @@ import {JBRuleset} from "./structs/JBRuleset.sol";
 /// seconds before the current ruleset ends. In other words, rulesets must be queued before the deadline to take effect.
 /// @dev Project rulesets are stored in a queue. Rulesets take effect after the previous ruleset in the queue ends, and
 /// only if they are approved by the previous ruleset's approval hook.
+/// @dev If `DURATION` is set longer than the ruleset's cycle duration, no queued ruleset can ever satisfy the deadline
+/// and the current ruleset will effectively be locked in perpetuity. Choose a `DURATION` shorter than the shortest
+/// cycle it will govern.
 contract JBDeadline is IJBRulesetApprovalHook {
     //*********************************************************************//
     // ---------------- public immutable stored properties --------------- //

package/src/JBDirectory.sol

@@ -185,7 +185,8 @@ contract JBDirectory is JBPermissioned, Ownable, IJBDirectory {
             revert JBDirectory_TokenNotAccepted(projectId, token, terminal);
         }
 
-        // If the terminal hasn't already been added to the project, add it.
+        // Implicit terminal addition is by design. A primary terminal must be in the terminals list;
+        // implicit addition avoids requiring a separate addTerminalsOf call.
         _addTerminalIfNeeded({projectId: projectId, terminal: terminal});
 
         // Store the terminal as the project's primary terminal for the token.

package/src/JBERC20.sol

@@ -47,7 +47,7 @@ contract JBERC20 is ERC20Votes, ERC20Permit, Ownable, IJBToken {
     /// @param account The address to burn tokens from.
     /// @param amount The amount of tokens to burn, as a fixed point number with 18 decimals.
     function burn(address account, uint256 amount) external override onlyOwner {
-        return _burn(account, amount);
+        return _burn({account: account, value: amount});
     }
 
     /// @notice Mints more of this token.
@@ -55,7 +55,16 @@ contract JBERC20 is ERC20Votes, ERC20Permit, Ownable, IJBToken {
     /// @param account The address to mint the new tokens to.
     /// @param amount The amount of tokens to mint, as a fixed point number with 18 decimals.
     function mint(address account, uint256 amount) external override onlyOwner {
-        return _mint(account, amount);
+        return _mint({account: account, value: amount});
+    }
+
+    /// @notice Sets the token's name and symbol.
+    /// @dev Can only be called by this contract's owner.
+    /// @param name_ The new name.
+    /// @param symbol_ The new symbol.
+    function setMetadata(string memory name_, string memory symbol_) external override onlyOwner {
+        _name = name_;
+        _symbol = symbol_;
     }
 
     //*********************************************************************//
@@ -130,6 +139,6 @@ contract JBERC20 is ERC20Votes, ERC20Permit, Ownable, IJBToken {
 
     /// @notice Required override.
     function _update(address from, address to, uint256 value) internal virtual override(ERC20, ERC20Votes) {
-        super._update(from, to, value);
+        super._update({from: from, to: to, value: value});
     }
 }