@rev-net/core-v6 0.0.56 → 0.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rev-net/core-v6",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,14 +26,14 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'revnet-core-v6'"
   },
   "dependencies": {
-    "@bananapus/721-hook-v6": "^0.0.50",
-    "@bananapus/buyback-hook-v6": "^0.0.46",
-    "@bananapus/core-v6": "^0.0.53",
-    "@bananapus/ownable-v6": "^0.0.24",
+    "@bananapus/721-hook-v6": "^0.0.51",
+    "@bananapus/buyback-hook-v6": "^0.0.47",
+    "@bananapus/core-v6": "^0.0.54",
+    "@bananapus/ownable-v6": "^0.0.25",
     "@bananapus/permission-ids-v6": "^0.0.25",
-    "@bananapus/router-terminal-v6": "^0.0.43",
-    "@bananapus/suckers-v6": "^0.0.46",
-    "@croptop/core-v6": "^0.0.42",
+    "@bananapus/router-terminal-v6": "^0.0.44",
+    "@bananapus/suckers-v6": "^0.0.47",
+    "@croptop/core-v6": "^0.0.48",
     "@openzeppelin/contracts": "5.6.1",
     "@uniswap/permit2": "github:Uniswap/permit2#cc56ad0f3439c502c246fc5cfcc3db92bb8b7219"
   },

package/script/Deploy.s.sol

@@ -67,54 +67,31 @@ contract DeployScript is Script, Sphinx {
     SuckerDeployment suckers;
     /// @notice tracks the deployment of the router terminal.
     RouterTerminalDeployment routerTerminal;
-
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint32 PREMINT_CHAIN_ID = 1;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    string NAME = "Revnet";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    string SYMBOL = "REV";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    string PROJECT_URI = "ipfs://QmcCBD5fM927LjkLDSJWtNEU9FohcbiPSfqtGRHXFHzJ4W";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint32 NATIVE_CURRENCY = uint32(uint160(JBConstants.NATIVE_TOKEN));
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint32 ETH_CURRENCY = JBCurrencyIds.ETH;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint8 DECIMALS = 18;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint256 DECIMAL_MULTIPLIER = 10 ** DECIMALS;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 ERC20_SALT = "_REV_ERC20_SALT_V6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 SUCKER_SALT = "_REV_SUCKER_SALT_V6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 DEPLOYER_SALT = "_REV_DEPLOYER_SALT_V6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 REVLOANS_SALT = "_REV_LOANS_SALT_V6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    bytes32 REVOWNER_SALT = "_REV_OWNER_SALT_V6_";
-    // forge-lint: disable-next-line(mixed-case-variable)
-    address LOANS_OWNER;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    address OPERATOR;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    address TRUSTED_FORWARDER;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    IPermit2 PERMIT2;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint48 REV_START_TIME = 1_740_089_444;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint104 REV_MAINNET_AUTO_ISSUANCE_ = 1_050_482_341_387_116_262_330_122;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint104 REV_BASE_AUTO_ISSUANCE_ = 38_544_322_230_437_559_731_228;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint104 REV_OP_AUTO_ISSUANCE_ = 32_069_388_242_375_817_844;
-    // forge-lint: disable-next-line(mixed-case-variable)
-    uint104 REV_ARB_AUTO_ISSUANCE_ = 3_479_431_776_906_850_000_000;
+    uint32 private constant _PREMINT_CHAIN_ID = 1;
+    string private constant _NAME = "Revnet";
+    string private constant _SYMBOL = "REV";
+    string private constant _PROJECT_URI = "ipfs://QmcCBD5fM927LjkLDSJWtNEU9FohcbiPSfqtGRHXFHzJ4W";
+    uint32 private constant _NATIVE_CURRENCY = uint32(uint160(JBConstants.NATIVE_TOKEN));
+    uint32 private constant _ETH_CURRENCY = JBCurrencyIds.ETH;
+    uint8 private constant _DECIMALS = 18;
+    uint256 private constant _DECIMAL_MULTIPLIER = 10 ** _DECIMALS;
+    bytes32 private constant _ERC20_SALT = "_REV_ERC20_SALT_V6_";
+    bytes32 private constant _SUCKER_SALT = "_REV_SUCKER_SALT_V6_";
+    bytes32 private constant _DEPLOYER_SALT = "_REV_DEPLOYER_SALT_V6_";
+    bytes32 private constant _REVLOANS_SALT = "_REV_LOANS_SALT_V6_";
+    bytes32 private constant _REVOWNER_SALT = "_REV_OWNER_SALT_V6_";
+    address private loansOwner;
+    address private operator;
+    address private trustedForwarder;
+    IPermit2 private permit2;
+    uint48 private constant _REV_START_TIME = 1_740_089_444;
+    uint104 private constant _REV_MAINNET_AUTO_ISSUANCE = 1_050_482_341_387_116_262_330_122;
+    uint104 private constant _REV_BASE_AUTO_ISSUANCE = 38_544_322_230_437_559_731_228;
+    uint104 private constant _REV_OP_AUTO_ISSUANCE = 32_069_388_242_375_817_844;
+    uint104 private constant _REV_ARB_AUTO_ISSUANCE = 3_479_431_776_906_850_000_000;
 
     function configureSphinx() public override {
-        // TODO: Update to contain revnet devs.
+        // Safe owners and threshold are resolved by the Sphinx project config.
         sphinxConfig.projectName = "revnet-core-v6";
         sphinxConfig.mainnets = ["ethereum", "optimism", "base", "arbitrum"];
         sphinxConfig.testnets = ["ethereum_sepolia", "optimism_sepolia", "base_sepolia", "arbitrum_sepolia"];
@@ -122,9 +99,9 @@ contract DeployScript is Script, Sphinx {
 
     function run() public {
         // Get the operator address.
-        OPERATOR = safeAddress();
+        operator = safeAddress();
         // Get the loans owner address.
-        LOANS_OWNER = safeAddress();
+        loansOwner = safeAddress();
 
         // Get the deployment addresses for the nana CORE for this chain.
         // We want to do this outside of the `sphinx` modifier.
@@ -169,8 +146,8 @@ contract DeployScript is Script, Sphinx {
         );
 
         // We use the same trusted forwarder and permit2 as the core deployment.
-        TRUSTED_FORWARDER = core.controller.trustedForwarder();
-        PERMIT2 = core.terminal.PERMIT2();
+        trustedForwarder = core.controller.trustedForwarder();
+        permit2 = core.terminal.PERMIT2();
 
         // Perform the deployment transactions.
         deploy();
@@ -182,7 +159,7 @@ contract DeployScript is Script, Sphinx {
 
         // Accept the chain's native currency through the multi terminal.
         accountingContextsToAccept[0] =
-            JBAccountingContext({token: JBConstants.NATIVE_TOKEN, decimals: DECIMALS, currency: NATIVE_CURRENCY});
+            JBAccountingContext({token: JBConstants.NATIVE_TOKEN, decimals: _DECIMALS, currency: _NATIVE_CURRENCY});
 
         // The terminals that the project will accept funds through.
         JBTerminalConfig[] memory terminalConfigurations = new JBTerminalConfig[](2);
@@ -202,25 +179,25 @@ contract DeployScript is Script, Sphinx {
             preferAddToBalance: false,
             percent: JBConstants.SPLITS_TOTAL_PERCENT,
             projectId: 0,
-            beneficiary: payable(OPERATOR),
+            beneficiary: payable(operator),
             lockedUntil: 0,
             hook: IJBSplitHook(address(0))
         });
 
         {
             REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](4);
-            issuanceConfs[0] = REVAutoIssuance({chainId: 1, count: REV_MAINNET_AUTO_ISSUANCE_, beneficiary: OPERATOR});
-            issuanceConfs[1] = REVAutoIssuance({chainId: 8453, count: REV_BASE_AUTO_ISSUANCE_, beneficiary: OPERATOR});
-            issuanceConfs[2] = REVAutoIssuance({chainId: 10, count: REV_OP_AUTO_ISSUANCE_, beneficiary: OPERATOR});
-            issuanceConfs[3] = REVAutoIssuance({chainId: 42_161, count: REV_ARB_AUTO_ISSUANCE_, beneficiary: OPERATOR});
+            issuanceConfs[0] = REVAutoIssuance({chainId: 1, count: _REV_MAINNET_AUTO_ISSUANCE, beneficiary: operator});
+            issuanceConfs[1] = REVAutoIssuance({chainId: 8453, count: _REV_BASE_AUTO_ISSUANCE, beneficiary: operator});
+            issuanceConfs[2] = REVAutoIssuance({chainId: 10, count: _REV_OP_AUTO_ISSUANCE, beneficiary: operator});
+            issuanceConfs[3] = REVAutoIssuance({chainId: 42_161, count: _REV_ARB_AUTO_ISSUANCE, beneficiary: operator});
 
             stageConfigurations[0] = REVStageConfig({
-                startsAtOrAfter: REV_START_TIME,
+                startsAtOrAfter: _REV_START_TIME,
                 autoIssuances: issuanceConfs,
                 splitPercent: 3800, // 38%
                 splits: splits,
                 // forge-lint: disable-next-line(unsafe-typecast)
-                initialIssuance: uint112(10_000 * DECIMAL_MULTIPLIER),
+                initialIssuance: uint112(10_000 * _DECIMAL_MULTIPLIER),
                 issuanceCutFrequency: 90 days,
                 issuanceCutPercent: 380_000_000, // 38%
                 cashOutTaxRate: 1000, // 0.1
@@ -232,10 +209,10 @@ contract DeployScript is Script, Sphinx {
             REVAutoIssuance[] memory issuanceConfs = new REVAutoIssuance[](1);
             issuanceConfs[0] = REVAutoIssuance({
                 // forge-lint: disable-next-line(unsafe-typecast)
-                chainId: PREMINT_CHAIN_ID,
+                chainId: _PREMINT_CHAIN_ID,
                 // forge-lint: disable-next-line(unsafe-typecast)
-                count: uint104(1_550_000 * DECIMAL_MULTIPLIER),
-                beneficiary: OPERATOR
+                count: uint104(1_550_000 * _DECIMAL_MULTIPLIER),
+                beneficiary: operator
             });
 
             stageConfigurations[1] = REVStageConfig({
@@ -265,9 +242,9 @@ contract DeployScript is Script, Sphinx {
 
         // The project's revnet configuration
         REVConfig memory revnetConfiguration = REVConfig({
-            description: REVDescription({name: NAME, ticker: SYMBOL, uri: PROJECT_URI, salt: ERC20_SALT}),
-            baseCurrency: ETH_CURRENCY,
-            operator: OPERATOR,
+            description: REVDescription({name: _NAME, ticker: _SYMBOL, uri: _PROJECT_URI, salt: _ERC20_SALT}),
+            baseCurrency: _ETH_CURRENCY,
+            operator: operator,
             scopeCashOutsToLocalBalances: false,
             stageConfigurations: stageConfigurations
         });
@@ -314,7 +291,7 @@ contract DeployScript is Script, Sphinx {
             }
             // Specify all sucker deployments.
             suckerDeploymentConfiguration =
-                REVSuckerDeploymentConfig({deployerConfigurations: suckerDeployerConfigurations, salt: SUCKER_SALT});
+                REVSuckerDeploymentConfig({deployerConfigurations: suckerDeployerConfigurations, salt: _SUCKER_SALT});
         }
 
         return FeeProjectConfig({
@@ -329,7 +306,7 @@ contract DeployScript is Script, Sphinx {
                     tokenUriResolver: IJB721TokenUriResolver(address(0)),
                     contractUri: "",
                     tiersConfig: JB721InitTiersConfig({
-                        tiers: new JB721TierConfig[](0), currency: ETH_CURRENCY, decimals: 18
+                        tiers: new JB721TierConfig[](0), currency: _ETH_CURRENCY, decimals: 18
                     }),
                     flags: REV721TiersHookFlags({
                         noNewTiersWithReserves: false,
@@ -351,8 +328,7 @@ contract DeployScript is Script, Sphinx {
     function deploy() public sphinx {
         // Check if singletons are already deployed before creating a new fee project.
         // This prevents creating orphan projects on script restarts.
-        // forge-lint: disable-next-line(mixed-case-variable)
-        uint256 FEE_PROJECT_ID;
+        uint256 feeProjectId;
 
         // Predict the REVLoans address for an arbitrary fee project ID to check if it exists.
         // We can't predict without a fee project ID, so we first check the REVDeployer which also stores it.
@@ -360,7 +336,7 @@ contract DeployScript is Script, Sphinx {
 
         // First, check if REVLoans is already deployed by trying with project ID = 0 (placeholder).
         // We need to iterate: if either singleton exists, extract the fee project ID from it.
-        // Since both encode FEE_PROJECT_ID, we check if any code exists at the predicted address
+        // Since both encode feeProjectId, we check if any code exists at the predicted address
         // for sequential project IDs starting from 1.
 
         // A simpler approach: predict the REVDeployer address for each possible fee project ID
@@ -385,10 +361,10 @@ contract DeployScript is Script, Sphinx {
         for (uint256 _candidateId = 1; _candidateId < _nextProjectId; _candidateId++) {
             // Predict REVLoans address for this candidate fee project ID.
             (address _candidateRevloansAddr, bool _candidateRevloansDeployed) = _isDeployed({
-                salt: REVLOANS_SALT,
+                salt: _REVLOANS_SALT,
                 creationCode: type(REVLoans).creationCode,
                 arguments: abi.encode(
-                    core.controller, suckers.registry, _candidateId, LOANS_OWNER, PERMIT2, TRUSTED_FORWARDER
+                    core.controller, suckers.registry, _candidateId, loansOwner, permit2, trustedForwarder
                 )
             });
 
@@ -396,14 +372,14 @@ contract DeployScript is Script, Sphinx {
                 // Verify the fee project ID matches by reading the immutable.
                 if (REVLoans(payable(_candidateRevloansAddr)).REV_ID() == _candidateId) {
                     // Record the fee project ID from the existing deployment.
-                    FEE_PROJECT_ID = _candidateId;
+                    feeProjectId = _candidateId;
                     // Record the existing REVLoans address.
                     _existingRevloansAddr = _candidateRevloansAddr;
                     _revloansExists = true;
 
                     // Also predict and verify the owner.
                     (_existingOwnerAddr, _revOwnerExists) = _isDeployed({
-                        salt: REVOWNER_SALT,
+                        salt: _REVOWNER_SALT,
                         creationCode: type(REVOwner).creationCode,
                         arguments: abi.encode(
                             IJBBuybackHookRegistry(address(buybackHook.registry)),
@@ -417,7 +393,7 @@ contract DeployScript is Script, Sphinx {
 
                     // Also predict and verify the deployer.
                     (_existingDeployerAddr, _revDeployerExists) = _isDeployed({
-                        salt: DEPLOYER_SALT,
+                        salt: _DEPLOYER_SALT,
                         creationCode: type(REVDeployer).creationCode,
                         arguments: abi.encode(
                             core.controller,
@@ -427,7 +403,7 @@ contract DeployScript is Script, Sphinx {
                             croptop.publisher,
                             IJBBuybackHookRegistry(address(buybackHook.registry)),
                             _candidateRevloansAddr,
-                            TRUSTED_FORWARDER,
+                            trustedForwarder,
                             _existingOwnerAddr
                         )
                     });
@@ -445,91 +421,90 @@ contract DeployScript is Script, Sphinx {
             for (uint256 i = _nextProjectId - 1; i >= 1; i--) {
                 if (core.projects.ownerOf(i) == safeAddress()) {
                     if (address(core.controller.DIRECTORY().controllerOf(i)) == address(0)) {
-                        FEE_PROJECT_ID = i;
+                        feeProjectId = i;
                         _foundExisting = true;
                         break;
                     }
                 }
             }
             if (!_foundExisting) {
-                // forge-lint: disable-next-line(mixed-case-variable)
-                FEE_PROJECT_ID = core.projects.createFor(safeAddress());
+                feeProjectId = core.projects.createFor(safeAddress());
             }
         }
 
         // Deploy REVLoans first — it only depends on the controller.
         REVLoans revloans = _revloansExists
             ? REVLoans(payable(_existingRevloansAddr))
-            : new REVLoans{salt: REVLOANS_SALT}({
+            : new REVLoans{salt: _REVLOANS_SALT}({
                 controller: core.controller,
                 suckerRegistry: suckers.registry,
-                revId: FEE_PROJECT_ID,
-                owner: LOANS_OWNER,
-                permit2: PERMIT2,
-                trustedForwarder: TRUSTED_FORWARDER
+                revId: feeProjectId,
+                owner: loansOwner,
+                permit2: permit2,
+                trustedForwarder: trustedForwarder
             });
 
         // Deploy REVOwner — the runtime data hook that handles pay and cash out callbacks.
         REVOwner revOwner = _revOwnerExists
             ? REVOwner(_existingOwnerAddr)
-            : new REVOwner{salt: REVOWNER_SALT}({
+            : new REVOwner{salt: _REVOWNER_SALT}({
                 buybackHook: IJBBuybackHookRegistry(address(buybackHook.registry)),
                 directory: core.controller.DIRECTORY(),
-                feeRevnetId: FEE_PROJECT_ID,
+                feeRevnetId: feeProjectId,
                 suckerRegistry: suckers.registry,
                 loans: revloans,
-                deployer: msg.sender
+                deployerAddress: msg.sender
             });
 
         // Deploy REVDeployer with the REVLoans, buyback hook, and REVOwner addresses.
         (address _deployerAddr, bool _deployerIsDeployed) = _revDeployerExists
             ? (_existingDeployerAddr, true)
             : _isDeployed({
-                salt: DEPLOYER_SALT,
+                salt: _DEPLOYER_SALT,
                 creationCode: type(REVDeployer).creationCode,
                 arguments: abi.encode(
                     core.controller,
                     suckers.registry,
-                    FEE_PROJECT_ID,
+                    feeProjectId,
                     hook.hook_deployer,
                     croptop.publisher,
                     IJBBuybackHookRegistry(address(buybackHook.registry)),
                     revloans,
-                    TRUSTED_FORWARDER,
+                    trustedForwarder,
                     address(revOwner)
                 )
             });
-        if (address(revOwner.DEPLOYER()) == address(0)) {
+        if (address(revOwner.deployer()) == address(0)) {
             revOwner.setDeployer(IREVDeployer(_deployerAddr));
         }
         REVDeployer _basicDeployer = _deployerIsDeployed
             ? REVDeployer(payable(_deployerAddr))
-            : new REVDeployer{salt: DEPLOYER_SALT}({
+            : new REVDeployer{salt: _DEPLOYER_SALT}({
                 controller: core.controller,
                 suckerRegistry: suckers.registry,
-                feeRevnetId: FEE_PROJECT_ID,
+                feeRevnetId: feeProjectId,
                 hookDeployer: hook.hook_deployer,
                 publisher: croptop.publisher,
                 buybackHook: IJBBuybackHookRegistry(address(buybackHook.registry)),
                 loans: revloans,
-                trustedForwarder: TRUSTED_FORWARDER,
+                trustedForwarder: trustedForwarder,
                 owner: address(revOwner)
             });
 
         // Only configure the fee project if it doesn't already have a controller.
         // This handles both fresh deploys and restarts where singletons exist but the fee project
         // was not yet configured.
-        bool _feeProjectConfigured = address(core.controller.DIRECTORY().controllerOf(FEE_PROJECT_ID)) != address(0);
+        bool _feeProjectConfigured = address(core.controller.DIRECTORY().controllerOf(feeProjectId)) != address(0);
         if (!_feeProjectConfigured) {
             // Approve the basic deployer to configure the project.
-            core.projects.approve({to: address(_basicDeployer), tokenId: FEE_PROJECT_ID});
+            core.projects.approve({to: address(_basicDeployer), tokenId: feeProjectId});
 
             // Build the config.
             FeeProjectConfig memory feeProjectConfig = getFeeProjectConfig();
 
             // Configure the project.
             _basicDeployer.deployFor({
-                revnetId: FEE_PROJECT_ID,
+                revnetId: feeProjectId,
                 configuration: feeProjectConfig.configuration,
                 terminalConfigurations: feeProjectConfig.terminalConfigurations,
                 suckerDeploymentConfiguration: feeProjectConfig.suckerDeploymentConfiguration,

package/script/helpers/RevnetCoreDeploymentLib.sol

@@ -10,8 +10,7 @@ import {IREVLoans} from "./../../src/interfaces/IREVLoans.sol";
 import {REVOwner} from "./../../src/REVOwner.sol";
 
 struct RevnetCoreDeployment {
-    // forge-lint: disable-next-line(mixed-case-variable)
-    IREVDeployer basic_deployer;
+    IREVDeployer basicDeployer;
     IREVLoans loans;
     REVOwner owner;
 }
@@ -23,17 +22,16 @@ library RevnetCoreDeploymentLib {
     Vm internal constant vm = Vm(VM_ADDRESS);
 
     function getDeployment(string memory path) internal returns (RevnetCoreDeployment memory deployment) {
-        // get chainId for which we need to get the deployment.
+        // Match the current chain ID to the Sphinx network name used in deployment artifacts.
         uint256 chainId = block.chainid;
 
-        // Deploy to get the constants.
-        // TODO: get constants without deploy.
+        // `SphinxConstants` exposes Sphinx's supported chain ID to network name mapping.
         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, network_name: networks[_i].name});
+                return getDeployment({path: path, networkName: networks[_i].name});
             }
         }
 
@@ -42,28 +40,27 @@ library RevnetCoreDeploymentLib {
 
     function getDeployment(
         string memory path,
-        // forge-lint: disable-next-line(mixed-case-variable)
-        string memory network_name
+        string memory networkName
     )
         internal
         view
         returns (RevnetCoreDeployment memory deployment)
     {
-        deployment.basic_deployer = IREVDeployer(
+        deployment.basicDeployer = IREVDeployer(
             _getDeploymentAddress({
-                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVDeployer"
+                path: path, projectName: "revnet-core-v6", networkName: networkName, contractName: "REVDeployer"
             })
         );
 
         deployment.loans = IREVLoans(
             _getDeploymentAddress({
-                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVLoans"
+                path: path, projectName: "revnet-core-v6", networkName: networkName, contractName: "REVLoans"
             })
         );
 
         deployment.owner = REVOwner(
             _getDeploymentAddress({
-                path: path, project_name: "revnet-core-v6", network_name: network_name, contractName: "REVOwner"
+                path: path, projectName: "revnet-core-v6", networkName: networkName, contractName: "REVOwner"
             })
         );
     }
@@ -75,10 +72,8 @@ library RevnetCoreDeploymentLib {
     /// @return The address of the contract.
     function _getDeploymentAddress(
         string memory path,
-        // forge-lint: disable-next-line(mixed-case-variable)
-        string memory project_name,
-        // forge-lint: disable-next-line(mixed-case-variable)
-        string memory network_name,
+        string memory projectName,
+        string memory networkName,
         string memory contractName
     )
         internal
@@ -87,7 +82,7 @@ library RevnetCoreDeploymentLib {
     {
         string memory deploymentJson =
         // forge-lint: disable-next-line(unsafe-cheatcode)
-        vm.readFile(string.concat(path, project_name, "/", network_name, "/", contractName, ".json"));
+        vm.readFile(string.concat(path, projectName, "/", networkName, "/", contractName, ".json"));
         return stdJson.readAddress({json: deploymentJson, key: ".address"});
     }
 }

package/src/REVDeployer.sol

@@ -79,12 +79,6 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
     /// @dev 30 days, in seconds.
     uint256 public constant override CASH_OUT_DELAY = 2_592_000;
 
-    /// @notice The cash out fee (as a fraction out of `JBConstants.MAX_FEE`).
-    /// Cashout fees are paid to the revnet with the `FEE_REVNET_ID`.
-    /// @dev Fees are charged on cashouts if the cash out tax rate is greater than 0%.
-    /// @dev When suckers withdraw funds, they do not pay cash out fees.
-    uint256 public constant override FEE = 25; // 2.5%
-
     /// @notice The default Uniswap pool fee tier used when auto-configuring buyback pools.
     /// @dev 10_000 = 1%. This is the standard fee tier for most project token pairs.
     uint24 public constant DEFAULT_BUYBACK_POOL_FEE = 10_000;
@@ -421,10 +415,12 @@ contract REVDeployer is ERC2771Context, IREVDeployer, IERC721Receiver {
                 sqrtPriceX96 = uint160(1 << 96);
             } else if (normalizedTerminalToken < projectToken) {
                 // token0 = terminal, token1 = project → price = issuance / terminalTokenUnit
-                sqrtPriceX96 = uint160(sqrt(mulDiv(uint256(initialIssuance), 1 << 192, terminalTokenUnit)));
+                sqrtPriceX96 =
+                    uint160(sqrt(mulDiv({x: uint256(initialIssuance), y: 1 << 192, denominator: terminalTokenUnit})));
             } else {
                 // token0 = project, token1 = terminal → price = terminalTokenUnit / issuance
-                sqrtPriceX96 = uint160(sqrt(mulDiv(terminalTokenUnit, 1 << 192, uint256(initialIssuance))));
+                sqrtPriceX96 =
+                    uint160(sqrt(mulDiv({x: terminalTokenUnit, y: 1 << 192, denominator: uint256(initialIssuance)})));
             }
         }
 

package/src/REVLoans.sol

@@ -747,6 +747,14 @@ contract REVLoans is ERC721, ERC2771Context, JBPermissioned, Ownable, IREVLoans
         address loanOwner = _ownerOf(loanId);
         _requirePermissionFrom({account: loanOwner, projectId: revnetId, permissionId: JBPermissionIds.REALLOCATE_LOAN});
 
+        // If the caller is adding fresh holder collateral on top of the reallocated amount, they must also have
+        // OPEN_LOAN permission for the loan owner: that fresh collateral comes from the owner's project-token
+        // balance and would otherwise let a REALLOCATE_LOAN-only operator open a brand-new loan against the owner's
+        // tokens through this entry point, bypassing the OPEN_LOAN gate that `borrowFrom` enforces.
+        if (collateralCountToAdd != 0) {
+            _requirePermissionFrom({account: loanOwner, projectId: revnetId, permissionId: JBPermissionIds.OPEN_LOAN});
+        }
+
         // Make sure the loan hasn't expired.
         // forge-lint: disable-next-line(block-timestamp)
         if (block.timestamp - _loanOf[loanId].createdAt > LOAN_LIQUIDATION_DURATION) {

package/src/REVOwner.sol

@@ -9,6 +9,7 @@ import {IJBRulesetDataHook} from "@bananapus/core-v6/src/interfaces/IJBRulesetDa
 import {IJBTerminal} from "@bananapus/core-v6/src/interfaces/IJBTerminal.sol";
 import {JBCashOuts} from "@bananapus/core-v6/src/libraries/JBCashOuts.sol";
 import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
+import {JBFees} from "@bananapus/core-v6/src/libraries/JBFees.sol";
 import {JBAccountingContext} from "@bananapus/core-v6/src/structs/JBAccountingContext.sol";
 import {JBAfterCashOutRecordedContext} from "@bananapus/core-v6/src/structs/JBAfterCashOutRecordedContext.sol";
 import {JBBeforeCashOutRecordedContext} from "@bananapus/core-v6/src/structs/JBBeforeCashOutRecordedContext.sol";
@@ -46,15 +47,6 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
     error REVOwner_CashOutDelayNotFinished(uint256 cashOutDelay, uint256 blockTimestamp);
     error REVOwner_Unauthorized(address caller, address expectedCaller);
 
-    //*********************************************************************//
-    // ------------------------- public constants ------------------------ //
-    //*********************************************************************//
-
-    /// @notice The cash out fee (as a fraction out of `JBConstants.MAX_FEE`).
-    /// @dev Cashout fees are paid to the revnet with the `FEE_REVNET_ID`.
-    /// @dev When suckers withdraw funds, they do not pay cash out fees.
-    uint256 public constant FEE = 25; // 2.5%
-
     //*********************************************************************//
     // --------------- public immutable stored properties ---------------- //
     //*********************************************************************//
@@ -89,7 +81,7 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
 
     /// @notice The deployer that manages revnet state.
     /// @dev Set once via `setDeployer()` using the precomputed canonical REVDeployer address.
-    IREVDeployer public DEPLOYER;
+    IREVDeployer public deployer;
 
     //*********************************************************************//
     // -------------------- private stored properties -------------------- //
@@ -107,7 +99,7 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
     /// @param feeRevnetId The Juicebox project ID of the fee revnet.
     /// @param suckerRegistry The sucker registry.
     /// @param loans The loan contract.
-    /// @param deployer The account allowed to bind the canonical deployer via `setDeployer`. Passed explicitly
+    /// @param deployerAddress The account allowed to bind the canonical deployer via `setDeployer`. Passed explicitly
     /// because CREATE2 deployments set `msg.sender` to the factory, not the intended operator.
     constructor(
         IJBBuybackHookRegistry buybackHook,
@@ -115,14 +107,14 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
         uint256 feeRevnetId,
         IJBSuckerRegistry suckerRegistry,
         IREVLoans loans,
-        address deployer
+        address deployerAddress
     ) {
         BUYBACK_HOOK = buybackHook;
         DIRECTORY = directory;
         FEE_REVNET_ID = feeRevnetId;
         SUCKER_REGISTRY = suckerRegistry;
         LOANS = loans;
-        _DEPLOYER = deployer;
+        _DEPLOYER = deployerAddress;
     }
 
     //*********************************************************************//
@@ -219,7 +211,7 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
         // a better price. This is by design.
         // Micro cash outs (< 40 wei at 2.5% fee) round feeCashOutCount to zero, bypassing the fee.
         // Economically insignificant: the gas cost of the transaction far exceeds the bypassed fee. No fix needed.
-        uint256 feeCashOutCount = mulDiv({x: context.cashOutCount, y: FEE, denominator: JBConstants.MAX_FEE});
+        uint256 feeCashOutCount = JBFees.standardFeeAmountFrom(context.cashOutCount);
         uint256 nonFeeCashOutCount = context.cashOutCount - feeCashOutCount;
 
         // Compute the gross (effective-surplus) reclaim and fee amounts. The bonding curve uses cross-chain effective
@@ -516,14 +508,14 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
     /// @dev The deployer address is precomputed and supplied by the account that created this REVOwner instance.
     /// Only that deploy-time binder may call this, which avoids an ambient public initializer where any first caller
     /// could seize the deployer role before the deterministic REVDeployer is actually deployed.
-    /// @param deployer The canonical REVDeployer instance that will manage revnet runtime state.
-    function setDeployer(IREVDeployer deployer) external {
+    /// @param newDeployer The canonical REVDeployer instance that will manage revnet runtime state.
+    function setDeployer(IREVDeployer newDeployer) external {
         // Only the account that deployed this REVOwner may complete the one-time deployer binding.
         if (msg.sender != _DEPLOYER) revert REVOwner_Unauthorized({caller: msg.sender, expectedCaller: _DEPLOYER});
         // Prevent the deployer binding from being overwritten after initialization.
-        if (address(DEPLOYER) != address(0)) revert REVOwner_AlreadyInitialized({deployer: address(DEPLOYER)});
+        if (address(deployer) != address(0)) revert REVOwner_AlreadyInitialized({deployer: address(deployer)});
         // Store the canonical REVDeployer that is authorized to manage runtime hook state.
-        DEPLOYER = deployer;
+        deployer = newDeployer;
     }
 
     /// @notice Store the cash out delay for a revnet.
@@ -531,8 +523,8 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
     /// @param revnetId The ID of the revnet.
     /// @param cashOutDelay The timestamp after which cash outs are allowed.
     function setCashOutDelayOf(uint256 revnetId, uint256 cashOutDelay) external {
-        if (msg.sender != address(DEPLOYER)) {
-            revert REVOwner_Unauthorized({caller: msg.sender, expectedCaller: address(DEPLOYER)});
+        if (msg.sender != address(deployer)) {
+            revert REVOwner_Unauthorized({caller: msg.sender, expectedCaller: address(deployer)});
         }
         cashOutDelayOf[revnetId] = cashOutDelay;
     }
@@ -542,8 +534,8 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
     /// @param revnetId The ID of the revnet.
     /// @param hook The tiered ERC-721 hook.
     function setTiered721HookOf(uint256 revnetId, IJB721TiersHook hook) external {
-        if (msg.sender != address(DEPLOYER)) {
-            revert REVOwner_Unauthorized({caller: msg.sender, expectedCaller: address(DEPLOYER)});
+        if (msg.sender != address(deployer)) {
+            revert REVOwner_Unauthorized({caller: msg.sender, expectedCaller: address(deployer)});
         }
         tiered721HookOf[revnetId] = hook;
     }

package/src/interfaces/IREVDeployer.sol

@@ -119,10 +119,6 @@ interface IREVDeployer {
     /// @return The directory contract.
     function DIRECTORY() external view returns (IJBDirectory);
 
-    /// @notice The cash out fee as a fraction out of `JBConstants.MAX_FEE`.
-    /// @return The fee value.
-    function FEE() external view returns (uint256);
-
     /// @notice The Juicebox project ID of the revnet that receives cash out fees.
     /// @return The fee revnet ID.
     function FEE_REVNET_ID() external view returns (uint256);

package/src/interfaces/IREVOwner.sol

@@ -11,6 +11,6 @@ interface IREVOwner {
     function cashOutDelayOf(uint256 revnetId) external view returns (uint256);
 
     /// @notice Bind the canonical deployer exactly once.
-    /// @param deployer The revnet deployer instance.
-    function setDeployer(IREVDeployer deployer) external;
+    /// @param newDeployer The revnet deployer instance.
+    function setDeployer(IREVDeployer newDeployer) external;
 }