@rev-net/core-v6 0.0.52 → 0.0.54

package/foundry.toml

@@ -1,5 +1,6 @@
 [profile.default]
 solc = '0.8.28'
+bytecode_hash = "none"
 evm_version = 'cancun'
 via_ir = true
 optimizer_runs = 200

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rev-net/core-v6",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "license": "MIT",
   "repository": {
     "type": "git",

package/script/Deploy.s.sol

@@ -478,7 +478,7 @@ contract DeployScript is Script, Sphinx {
                 feeRevnetId: FEE_PROJECT_ID,
                 suckerRegistry: suckers.registry,
                 loans: revloans,
-                deployerBinder: msg.sender
+                deployer: msg.sender
             });
 
         // Deploy REVDeployer with the REVLoans, buyback hook, and REVOwner addresses.

package/src/REVOwner.sol

@@ -96,7 +96,7 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
     //*********************************************************************//
 
     /// @notice The account allowed to bind the canonical deployer exactly once.
-    address private immutable _DEPLOYER_BINDER;
+    address private immutable _DEPLOYER;
 
     //*********************************************************************//
     // -------------------------- constructor ---------------------------- //
@@ -107,7 +107,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 deployerBinder The account allowed to bind the canonical deployer via `setDeployer`. Passed explicitly
+    /// @param deployer 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 +115,14 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
         uint256 feeRevnetId,
         IJBSuckerRegistry suckerRegistry,
         IREVLoans loans,
-        address deployerBinder
+        address deployer
     ) {
         BUYBACK_HOOK = buybackHook;
         DIRECTORY = directory;
         FEE_REVNET_ID = feeRevnetId;
         SUCKER_REGISTRY = suckerRegistry;
         LOANS = loans;
-        _DEPLOYER_BINDER = deployerBinder;
+        _DEPLOYER = deployer;
     }
 
     //*********************************************************************//
@@ -261,12 +261,23 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
             }
         }
 
-        // Build a context for the buyback hook using the non-fee token count and cross-chain-adjusted values
-        // so the buyback hook sees the global state for its swap-vs-passthrough routing decision.
+        // Build a context for the buyback hook using the non-fee token count and the surplus that
+        // produces the LOCALLY-CAPPED direct reclaim. The buyback hook compares this direct reclaim
+        // against its pool route to decide noop-vs-swap; passing the global pre-cap surplus would
+        // make it score the direct path against an amount the terminal cannot actually deliver,
+        // so the hook would skip pools that would have paid more than the final local reclaim.
+        // `cashOutFrom` is linear in surplus, so scaling the surplus by the same factor that
+        // scaled the reclaim recovers the locally-capped reclaim at the same cashOutCount/
+        // totalSupply/tax inputs.
+        uint256 buybackSurplus = effectiveSurplusValue;
+        if (postFeeReclaimedAmount != unscaledReclaim && unscaledReclaim != 0) {
+            buybackSurplus = mulDiv({x: effectiveSurplusValue, y: postFeeReclaimedAmount, denominator: unscaledReclaim});
+        }
+
         JBBeforeCashOutRecordedContext memory buybackHookContext = context;
         buybackHookContext.cashOutCount = nonFeeCashOutCount;
         buybackHookContext.totalSupply = totalSupply;
-        buybackHookContext.surplus.value = effectiveSurplusValue;
+        buybackHookContext.surplus.value = buybackSurplus;
 
         // Let the buyback hook adjust the cash out parameters and optionally return a hook specification.
         JBCashOutHookSpecification[] memory buybackHookSpecifications;
@@ -508,9 +519,7 @@ contract REVOwner is IJBRulesetDataHook, IJBCashOutHook, IJBPeerChainAdjustedAcc
     /// @param deployer The canonical REVDeployer instance that will manage revnet runtime state.
     function setDeployer(IREVDeployer deployer) external {
         // Only the account that deployed this REVOwner may complete the one-time deployer binding.
-        if (msg.sender != _DEPLOYER_BINDER) {
-            revert REVOwner_Unauthorized({caller: msg.sender, expectedCaller: _DEPLOYER_BINDER});
-        }
+        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)});
         // Store the canonical REVDeployer that is authorized to manage runtime hook state.