@croptop/core-v6 0.0.32 → 0.0.34

package/src/CTPublisher.sol

@@ -27,7 +27,6 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
     // --------------------------- custom errors ------------------------- //
     //*********************************************************************//
 
-    // forge-lint: disable-next-line(mixed-case-variable)
     error CTPublisher_DuplicatePost(bytes32 encodedIPFSUri);
     error CTPublisher_EmptyEncodedIPFSUri();
     error CTPublisher_InsufficientEthSent(uint256 expected, uint256 sent);
@@ -66,7 +65,6 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
     /// @notice The ID of the tier that an IPFS metadata has been saved to.
     /// @custom:param hook The hook for which the tier ID applies.
     /// @custom:param encodedIPFSUri The IPFS URI.
-    // forge-lint: disable-next-line(mixed-case-variable)
     mapping(address hook => mapping(bytes32 encodedIPFSUri => uint256)) public override tierIdForEncodedIPFSUriOf;
 
     //*********************************************************************//
@@ -105,141 +103,6 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
         FEE_PROJECT_ID = feeProjectId;
     }
 
-    //*********************************************************************//
-    // ------------------------- external views -------------------------- //
-    //*********************************************************************//
-
-    /// @notice Get the tiers for the provided encoded IPFS URIs.
-    /// @dev The returned tier IDs may be stale if the corresponding tiers were removed externally via adjustTiers.
-    /// In that case, the store's tierOf call will return a tier with default/empty values. Callers should check
-    /// the returned tier's initialSupply or other fields to confirm the tier still exists.
-    /// @param hook The hook from which to get tiers.
-    /// @param encodedIPFSUris The URIs to get tiers of.
-    /// @return tiers The tiers that correspond to the provided encoded IPFS URIs. If there's no tier yet, an empty tier
-    /// is returned.
-    function tiersFor(
-        address hook,
-        // forge-lint: disable-next-line(mixed-case-variable)
-        bytes32[] memory encodedIPFSUris
-    )
-        external
-        view
-        override
-        returns (JB721Tier[] memory tiers)
-    {
-        // forge-lint: disable-next-line(mixed-case-variable)
-        uint256 numberOfEncodedIPFSUris = encodedIPFSUris.length;
-
-        // Initialize the tier array being returned.
-        tiers = new JB721Tier[](numberOfEncodedIPFSUris);
-
-        // Get the tier for each provided encoded IPFS URI.
-        for (uint256 i; i < numberOfEncodedIPFSUris;) {
-            // Check if there's a tier ID stored for the encoded IPFS URI.
-            uint256 tierId = tierIdForEncodedIPFSUriOf[hook][encodedIPFSUris[i]];
-
-            // If there's a tier ID stored, resolve it.
-            if (tierId != 0) {
-                // slither-disable-next-line calls-loop
-                tiers[i] = IJB721TiersHook(hook).STORE().tierOf({hook: hook, id: tierId, includeResolvedUri: false});
-            }
-
-            unchecked {
-                ++i;
-            }
-        }
-    }
-
-    //*********************************************************************//
-    // -------------------------- public views --------------------------- //
-    //*********************************************************************//
-
-    /// @notice Post allowances for a particular category on a particular hook.
-    /// @param hook The hook contract for which this allowance applies.
-    /// @param category The category for which this allowance applies.
-    /// @return minimumPrice The minimum price that a poster must pay to record a new NFT.
-    /// @return minimumTotalSupply The minimum total number of available tokens that a minter must set to record a new
-    /// NFT.
-    /// @return maximumTotalSupply The max total supply of NFTs that can be made available when minting. Must be >=
-    /// minimumTotalSupply.
-    /// @return maximumSplitPercent The maximum split percent that a poster can set. 0 means splits are not allowed.
-    /// @return allowedAddresses The addresses allowed to post. Returns empty if all addresses are allowed.
-    function allowanceFor(
-        address hook,
-        uint256 category
-    )
-        public
-        view
-        override
-        returns (
-            uint256 minimumPrice,
-            uint256 minimumTotalSupply,
-            uint256 maximumTotalSupply,
-            uint256 maximumSplitPercent,
-            address[] memory allowedAddresses
-        )
-    {
-        // Get a reference to the packed values.
-        uint256 packed = _packedAllowanceFor[hook][category];
-
-        // minimum price in bits 0-103 (104 bits).
-        // forge-lint: disable-next-line(unsafe-typecast)
-        minimumPrice = uint256(uint104(packed));
-        // minimum supply in bits 104-135 (32 bits).
-        // forge-lint: disable-next-line(unsafe-typecast)
-        minimumTotalSupply = uint256(uint32(packed >> 104));
-        // maximum supply in bits 136-167 (32 bits).
-        // forge-lint: disable-next-line(unsafe-typecast)
-        maximumTotalSupply = uint256(uint32(packed >> 136));
-        // maximum split percent in bits 168-199 (32 bits).
-        // forge-lint: disable-next-line(unsafe-typecast)
-        maximumSplitPercent = uint256(uint32(packed >> 168));
-
-        allowedAddresses = _allowedAddresses[hook][category];
-    }
-
-    //*********************************************************************//
-    // -------------------------- internal views ------------------------- //
-    //*********************************************************************//
-
-    /// @dev ERC-2771 specifies the context as being a single address (20 bytes).
-    function _contextSuffixLength() internal view virtual override(ERC2771Context, Context) returns (uint256) {
-        return super._contextSuffixLength();
-    }
-
-    /// @notice Check if an address is included in an allow list.
-    /// @dev Uses an O(n) linear scan over the `addresses` array. This is acceptable for typical allow list sizes
-    /// (fewer than ~100 addresses), where gas cost is negligible. For very large allow lists, a Merkle proof
-    /// pattern would scale better, but the added complexity is not warranted for the expected use case.
-    /// @param addrs The candidate address.
-    /// @param addresses An array of allowed addresses.
-    function _isAllowed(address addrs, address[] memory addresses) internal pure returns (bool) {
-        // Keep a reference to the number of address to check against.
-        uint256 numberOfAddresses = addresses.length;
-
-        // Check if the address is included
-        for (uint256 i; i < numberOfAddresses;) {
-            if (addrs == addresses[i]) return true;
-            unchecked {
-                ++i;
-            }
-        }
-
-        return false;
-    }
-
-    /// @notice Returns the calldata, prefered to use over `msg.data`
-    /// @return calldata the `msg.data` of this call
-    function _msgData() internal view override(ERC2771Context, Context) returns (bytes calldata) {
-        return ERC2771Context._msgData();
-    }
-
-    /// @notice Returns the sender, prefered to use over `msg.sender`
-    /// @return sender the sender address of this call.
-    function _msgSender() internal view override(ERC2771Context, Context) returns (address sender) {
-        return ERC2771Context._msgSender();
-    }
-
     //*********************************************************************//
     // ---------------------- external transactions ---------------------- //
     //*********************************************************************//
@@ -446,7 +309,98 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
     }
 
     //*********************************************************************//
-    // ------------------------ internal functions ----------------------- //
+    // ------------------------- external views -------------------------- //
+    //*********************************************************************//
+
+    /// @notice Get the tiers for the provided encoded IPFS URIs.
+    /// @dev The returned tier IDs may be stale if the corresponding tiers were removed externally via adjustTiers.
+    /// In that case, the store's tierOf call will return a tier with default/empty values. Callers should check
+    /// the returned tier's initialSupply or other fields to confirm the tier still exists.
+    /// @param hook The hook from which to get tiers.
+    /// @param encodedIPFSUris The URIs to get tiers of.
+    /// @return tiers The tiers that correspond to the provided encoded IPFS URIs. If there's no tier yet, an empty tier
+    /// is returned.
+    function tiersFor(
+        address hook,
+        bytes32[] memory encodedIPFSUris
+    )
+        external
+        view
+        override
+        returns (JB721Tier[] memory tiers)
+    {
+        uint256 numberOfEncodedIPFSUris = encodedIPFSUris.length;
+
+        // Initialize the tier array being returned.
+        tiers = new JB721Tier[](numberOfEncodedIPFSUris);
+
+        // Get the tier for each provided encoded IPFS URI.
+        for (uint256 i; i < numberOfEncodedIPFSUris;) {
+            // Check if there's a tier ID stored for the encoded IPFS URI.
+            uint256 tierId = tierIdForEncodedIPFSUriOf[hook][encodedIPFSUris[i]];
+
+            // If there's a tier ID stored, resolve it.
+            if (tierId != 0) {
+                // slither-disable-next-line calls-loop
+                tiers[i] = IJB721TiersHook(hook).STORE().tierOf({hook: hook, id: tierId, includeResolvedUri: false});
+            }
+
+            unchecked {
+                ++i;
+            }
+        }
+    }
+
+    //*********************************************************************//
+    // -------------------------- public views --------------------------- //
+    //*********************************************************************//
+
+    /// @notice Post allowances for a particular category on a particular hook.
+    /// @param hook The hook contract for which this allowance applies.
+    /// @param category The category for which this allowance applies.
+    /// @return minimumPrice The minimum price that a poster must pay to record a new NFT.
+    /// @return minimumTotalSupply The minimum total number of available tokens that a minter must set to record a new
+    /// NFT.
+    /// @return maximumTotalSupply The max total supply of NFTs that can be made available when minting. Must be >=
+    /// minimumTotalSupply.
+    /// @return maximumSplitPercent The maximum split percent that a poster can set. 0 means splits are not allowed.
+    /// @return allowedAddresses The addresses allowed to post. Returns empty if all addresses are allowed.
+    function allowanceFor(
+        address hook,
+        uint256 category
+    )
+        public
+        view
+        override
+        returns (
+            uint256 minimumPrice,
+            uint256 minimumTotalSupply,
+            uint256 maximumTotalSupply,
+            uint256 maximumSplitPercent,
+            address[] memory allowedAddresses
+        )
+    {
+        // Get a reference to the packed values.
+        uint256 packed = _packedAllowanceFor[hook][category];
+
+        // minimum price in bits 0-103 (104 bits).
+        // forge-lint: disable-next-line(unsafe-typecast)
+        minimumPrice = uint256(uint104(packed));
+        // minimum supply in bits 104-135 (32 bits).
+        // forge-lint: disable-next-line(unsafe-typecast)
+        minimumTotalSupply = uint256(uint32(packed >> 104));
+        // maximum supply in bits 136-167 (32 bits).
+        // forge-lint: disable-next-line(unsafe-typecast)
+        maximumTotalSupply = uint256(uint32(packed >> 136));
+        // maximum split percent in bits 168-199 (32 bits).
+        // forge-lint: disable-next-line(unsafe-typecast)
+        maximumSplitPercent = uint256(uint32(packed >> 168));
+
+        allowedAddresses = _allowedAddresses[hook][category];
+    }
+
+    //*********************************************************************//
+    // ------------------------ internal helpers ------------------------- //
     //*********************************************************************//
 
     /// @notice Setup the posts.
@@ -613,4 +567,46 @@ contract CTPublisher is JBPermissioned, ERC2771Context, ICTPublisher {
             }
         }
     }
+
+    /// @notice Check if an address is included in an allow list.
+    /// @dev Uses an O(n) linear scan over the `addresses` array. This is acceptable for typical allow list sizes
+    /// (fewer than ~100 addresses), where gas cost is negligible. For very large allow lists, a Merkle proof
+    /// pattern would scale better, but the added complexity is not warranted for the expected use case.
+    /// @param addrs The candidate address.
+    /// @param addresses An array of allowed addresses.
+    function _isAllowed(address addrs, address[] memory addresses) internal pure returns (bool) {
+        // Keep a reference to the number of address to check against.
+        uint256 numberOfAddresses = addresses.length;
+
+        // Check if the address is included
+        for (uint256 i; i < numberOfAddresses;) {
+            if (addrs == addresses[i]) return true;
+            unchecked {
+                ++i;
+            }
+        }
+
+        return false;
+    }
+
+    //*********************************************************************//
+    // -------------------------- internal views ------------------------- //
+    //*********************************************************************//
+
+    /// @dev ERC-2771 specifies the context as being a single address (20 bytes).
+    function _contextSuffixLength() internal view virtual override(ERC2771Context, Context) returns (uint256) {
+        return super._contextSuffixLength();
+    }
+
+    /// @notice Returns the calldata, prefered to use over `msg.data`
+    /// @return calldata the `msg.data` of this call
+    function _msgData() internal view override(ERC2771Context, Context) returns (bytes calldata) {
+        return ERC2771Context._msgData();
+    }
+
+    /// @notice Returns the sender, prefered to use over `msg.sender`
+    /// @return sender the sender address of this call.
+    function _msgSender() internal view override(ERC2771Context, Context) returns (address sender) {
+        return ERC2771Context._msgSender();
+    }
 }

package/src/interfaces/ICTPublisher.sol

@@ -73,7 +73,7 @@ interface ICTPublisher {
     /// @param hook The hook for which the tier ID applies.
     /// @param encodedIPFSUri The encoded IPFS URI to look up.
     /// @return The tier ID, or 0 if the URI has not been published.
-    // forge-lint: disable-next-line(mixed-case-function, mixed-case-variable)
+    // forge-lint: disable-next-line(mixed-case-function)
     function tierIdForEncodedIPFSUriOf(address hook, bytes32 encodedIPFSUri) external view returns (uint256);
 
     /// @notice Get the tiers for the provided encoded IPFS URIs.
@@ -81,7 +81,6 @@ interface ICTPublisher {
     /// @param encodedIPFSUris The URIs to get tiers of.
     /// @return tiers The tiers that correspond to the provided encoded IPFS URIs. Empty tiers are returned for URIs
     /// without a tier.
-    // forge-lint: disable-next-line(mixed-case-variable)
     function tiersFor(address hook, bytes32[] memory encodedIPFSUris) external view returns (JB721Tier[] memory tiers);
 
     /// @notice Configure the allowed criteria for publishing new NFTs to a hook.

package/src/structs/CTAllowedPost.sol

@@ -11,7 +11,6 @@ pragma solidity ^0.8.0;
 /// @custom:member maximumSplitPercent The maximum split percent (out of JBConstants.SPLITS_TOTAL_PERCENT) that a
 /// poster can set. 0 means splits are not allowed.
 /// @custom:member allowedAddresses A list of addresses that are allowed to post on the category through Croptop.
-// forge-lint: disable-next-line(pascal-case-struct)
 struct CTAllowedPost {
     address hook;
     uint24 category;

package/src/structs/CTDeployerAllowedPost.sol

@@ -10,7 +10,6 @@ pragma solidity ^0.8.0;
 /// @custom:member maximumSplitPercent The maximum split percent (out of JBConstants.SPLITS_TOTAL_PERCENT) that a
 /// poster can set. 0 means splits are not allowed.
 /// @custom:member allowedAddresses A list of addresses that are allowed to post on the category through Croptop.
-// forge-lint: disable-next-line(pascal-case-struct)
 struct CTDeployerAllowedPost {
     uint24 category;
     uint104 minimumPrice;

package/src/structs/CTPost.sol

@@ -12,9 +12,7 @@ import {JBSplit} from "@bananapus/core-v6/src/structs/JBSplit.sol";
 /// @custom:member splitPercent The percent of the tier's price to route to the splits (out of
 /// JBConstants.SPLITS_TOTAL_PERCENT).
 /// @custom:member splits The splits to route funds to when this tier is minted.
-// forge-lint: disable-next-line(pascal-case-struct)
 struct CTPost {
-    // forge-lint: disable-next-line(mixed-case-variable)
     bytes32 encodedIPFSUri;
     uint32 totalSupply;
     uint104 price;

package/src/structs/CTProjectConfig.sol

@@ -11,7 +11,6 @@ import {CTDeployerAllowedPost} from "../structs/CTDeployerAllowedPost.sol";
 /// @param name The name of the collection where posts will go.
 /// @param symbol The symbol of the collection where posts will go.
 /// @param salt A salt to use for the deterministic deployment.
-// forge-lint: disable-next-line(pascal-case-struct)
 struct CTProjectConfig {
     JBTerminalConfig[] terminalConfigurations;
     string projectUri;

package/src/structs/CTSuckerDeploymentConfig.sol

@@ -5,7 +5,6 @@ import {JBSuckerDeployerConfig} from "@bananapus/suckers-v6/src/structs/JBSucker
 
 /// @custom:member deployerConfigurations The information for how to suck tokens to other chains.
 /// @custom:member salt The salt to use for creating suckers so that they use the same address across chains.
-// forge-lint: disable-next-line(pascal-case-struct)
 struct CTSuckerDeploymentConfig {
     JBSuckerDeployerConfig[] deployerConfigurations;
     bytes32 salt;

package/test/CTDeployer.t.sol

@@ -56,10 +56,11 @@ contract MockDataHook is IJBRulesetDataHook {
             uint256 cashOutTaxRate,
             uint256 cashOutCount,
             uint256 totalSupply,
+            uint256 surplusValue,
             JBCashOutHookSpecification[] memory hookSpecifications
         )
     {
-        return (TAX_RATE, context.cashOutCount, context.totalSupply, hookSpecifications);
+        return (TAX_RATE, context.cashOutCount, context.totalSupply, context.surplus.value, hookSpecifications);
     }
 
     function beforePayRecordedWith(JBBeforePayRecordedContext calldata)
@@ -434,7 +435,7 @@ contract TestCTDeployer is Test {
         JBBeforeCashOutRecordedContext memory context =
             _buildCashOutContext(deployedProjectId, unauthorized, 100e18, 1000e18);
 
-        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(context);
 
         assertEq(taxRate, 5000, "tax rate should come from data hook");
         assertEq(cashOutCount, 100e18, "cashOutCount should be forwarded");
@@ -455,7 +456,7 @@ contract TestCTDeployer is Test {
         JBBeforeCashOutRecordedContext memory context =
             _buildCashOutContext(deployedProjectId, suckerAddr, 100e18, 1000e18);
 
-        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(context);
 
         assertEq(taxRate, 0, "sucker should get 0% tax rate");
         assertEq(cashOutCount, 100e18, "cashOutCount should pass through");
@@ -466,7 +467,7 @@ contract TestCTDeployer is Test {
     function test_beforeCashOutRecordedWith_returnsDefaultsWhenNoDataHook() public {
         JBBeforeCashOutRecordedContext memory context = _buildCashOutContext(999, unauthorized, 100e18, 1000e18);
 
-        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply, JBCashOutHookSpecification[] memory specs) =
+        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,, JBCashOutHookSpecification[] memory specs) =
             deployer.beforeCashOutRecordedWith(context);
 
         assertEq(taxRate, context.cashOutTaxRate, "cashOutTaxRate should be returned as-is from context");

package/test/Fork.t.sol

@@ -21,6 +21,7 @@ import {JBConstants} from "@bananapus/core-v6/src/libraries/JBConstants.sol";
 import {JB721TiersHookStore} from "@bananapus/721-hook-v6/src/JB721TiersHookStore.sol";
 import {JB721TiersHook} from "@bananapus/721-hook-v6/src/JB721TiersHook.sol";
 import {JB721TiersHookDeployer} from "@bananapus/721-hook-v6/src/JB721TiersHookDeployer.sol";
+import {JB721CheckpointsDeployer} from "@bananapus/721-hook-v6/src/JB721CheckpointsDeployer.sol";
 import {JBAddressRegistry} from "@bananapus/address-registry-v6/src/JBAddressRegistry.sol";
 
 // Suckers — deploy fresh within fork.
@@ -166,7 +167,7 @@ contract ForkTest is Test {
         jbPermissions = new JBPermissions(trustedForwarder);
         jbProjects = new JBProjects(multisig, address(0), trustedForwarder);
         jbDirectory = new JBDirectory(jbPermissions, jbProjects, multisig);
-        JBERC20 jbErc20 = new JBERC20();
+        JBERC20 jbErc20 = new JBERC20(jbPermissions, jbProjects);
         jbTokens = new JBTokens(jbDirectory, jbErc20);
         jbRulesets = new JBRulesets(jbDirectory);
         jbPrices = new JBPrices(jbDirectory, jbPermissions, jbProjects, multisig, trustedForwarder);
@@ -193,9 +194,11 @@ contract ForkTest is Test {
     function _deploy721Hook() internal {
         JB721TiersHookStore store = new JB721TiersHookStore();
         JBAddressRegistry addressRegistry = new JBAddressRegistry();
+        JB721CheckpointsDeployer checkpointsDeployer = new JB721CheckpointsDeployer();
 
-        JB721TiersHook hookImpl =
-            new JB721TiersHook(jbDirectory, jbPermissions, jbPrices, jbRulesets, store, jbSplits, trustedForwarder);
+        JB721TiersHook hookImpl = new JB721TiersHook(
+            jbDirectory, jbPermissions, jbPrices, jbRulesets, store, jbSplits, checkpointsDeployer, trustedForwarder
+        );
 
         hookDeployer = new JB721TiersHookDeployer(hookImpl, store, addressRegistry, trustedForwarder);
     }

package/test/TestAuditGaps.sol

@@ -37,7 +37,7 @@ contract RevertingDataHook is IJBRulesetDataHook {
         external
         pure
         override
-        returns (uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
+        returns (uint256, uint256, uint256, uint256, JBCashOutHookSpecification[] memory)
     {
         revert("DATA_HOOK_REVERTED");
     }
@@ -81,10 +81,11 @@ contract SuccessDataHook is IJBRulesetDataHook {
             uint256 cashOutTaxRate,
             uint256 cashOutCount,
             uint256 totalSupply,
+            uint256 surplusValue,
             JBCashOutHookSpecification[] memory hookSpecifications
         )
     {
-        return (TAX_RATE, context.cashOutCount, context.totalSupply, hookSpecifications);
+        return (TAX_RATE, context.cashOutCount, context.totalSupply, context.surplus.value, hookSpecifications);
     }
 
     function beforePayRecordedWith(JBBeforePayRecordedContext calldata context)
@@ -243,7 +244,7 @@ contract TestAuditGaps is Test {
         // dataHookOf[999] is address(0) by default (never set).
         JBBeforeCashOutRecordedContext memory context = _buildCashOutContext(999, unauthorized, 100e18, 1000e18);
 
-        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply, JBCashOutHookSpecification[] memory specs) =
+        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,, JBCashOutHookSpecification[] memory specs) =
             deployer.beforeCashOutRecordedWith(context);
 
         assertEq(taxRate, context.cashOutTaxRate, "cashOutTaxRate should be returned as-is from context");
@@ -269,7 +270,7 @@ contract TestAuditGaps is Test {
         JBBeforeCashOutRecordedContext memory context =
             _buildCashOutContext(hookProjectId, unauthorized, 100e18, 1000e18);
 
-        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(context);
 
         assertEq(taxRate, 5000, "tax rate should be forwarded from data hook");
         assertEq(cashOutCount, 100e18, "cashOutCount should be forwarded");
@@ -302,7 +303,7 @@ contract TestAuditGaps is Test {
         JBBeforeCashOutRecordedContext memory context = _buildCashOutContext(hookProjectId, realSucker, 100e18, 1000e18);
 
         // Should NOT revert because suckers bypass the data hook entirely.
-        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate, uint256 cashOutCount, uint256 totalSupply,,) = deployer.beforeCashOutRecordedWith(context);
 
         assertEq(taxRate, 0, "sucker should get 0% tax rate");
         assertEq(cashOutCount, 100e18, "cashOutCount should pass through");
@@ -320,7 +321,7 @@ contract TestAuditGaps is Test {
         // fakeSucker is NOT registered as a sucker (default mock returns false).
         JBBeforeCashOutRecordedContext memory context = _buildCashOutContext(hookProjectId, fakeSucker, 100e18, 1000e18);
 
-        (uint256 taxRate,,,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate,,,,) = deployer.beforeCashOutRecordedWith(context);
 
         // Should get the data hook's tax rate (5000), not 0.
         assertEq(taxRate, 5000, "non-sucker should not bypass tax");
@@ -340,7 +341,7 @@ contract TestAuditGaps is Test {
 
         JBBeforeCashOutRecordedContext memory context = _buildCashOutContext(hookProjectId, realSucker, 100e18, 1000e18);
 
-        (uint256 taxRate,,,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate,,,,) = deployer.beforeCashOutRecordedWith(context);
 
         // Should get the data hook's tax rate, not 0.
         assertEq(taxRate, 5000, "sucker from wrong project should not bypass tax");
@@ -359,7 +360,7 @@ contract TestAuditGaps is Test {
 
         JBBeforeCashOutRecordedContext memory context = _buildCashOutContext(hookProjectId, realSucker, 100e18, 1000e18);
 
-        (uint256 taxRate,,,) = deployer.beforeCashOutRecordedWith(context);
+        (uint256 taxRate,,,,) = deployer.beforeCashOutRecordedWith(context);
 
         assertEq(taxRate, 0, "valid sucker should get 0% tax");
     }